diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index eda2ad2ad..756df1be3 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -1319,6 +1319,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1661,14 +1663,14 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1915,6 +1917,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 51aed581d..fccf5f847 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -1427,6 +1427,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1607,14 +1609,14 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_COLORAPP_TCMODE_LABEL1;Curve mode 1
 !TP_COLORAPP_TCMODE_LABEL2;Curve mode 2
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1886,6 +1888,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 2476aeb41..09439c2e4 100644
--- a/rtdata/languages/Chinese (Traditional)	
+++ b/rtdata/languages/Chinese (Traditional)	
@@ -979,6 +979,8 @@ TP_WBALANCE_TEMPERATURE;色溫
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1462,14 +1464,14 @@ TP_WBALANCE_TEMPERATURE;色溫
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1842,6 +1844,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 29cf45b3d..67c2cf0e3 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -38,7 +38,7 @@
 #37 2017-01-10 updated by mkyral
 #38 2017-04-26 updated by mkyral
 #39 2017-07-21 updated by mkyral
-
+#40 2017-12-13 updated by mkyral
 ABOUT_TAB_BUILD;Verze
 ABOUT_TAB_CREDITS;Zásluhy
 ABOUT_TAB_LICENSE;Licence
@@ -73,6 +73,7 @@ CURVEEDITOR_TOOLTIPPASTE;Vložit křivku ze schránky.
 CURVEEDITOR_TOOLTIPSAVE;Uložit současnou křivku.
 CURVEEDITOR_TYPE;Typ
 DIRBROWSER_FOLDERS;Složky
+DONT_SHOW_AGAIN;Zprávu znova nezobrazovat.
 DYNPROFILEEDITOR_DELETE;Smazat
 DYNPROFILEEDITOR_EDIT;Upravit
 DYNPROFILEEDITOR_EDIT_RULE;Upravit pravidlo dynamického profilu
@@ -107,6 +108,7 @@ EXIFPANEL_RESET;Obnovit
 EXIFPANEL_RESETALL;Obnovit vše
 EXIFPANEL_RESETALLHINT;Obnoví původní hodnoty u všech štítků.
 EXIFPANEL_RESETHINT;Obnoví původní hodnoty u vybraných štítků.
+EXIFPANEL_SHOWALL;Zobrazit vše
 EXIFPANEL_SUBDIRECTORY;Podadresář
 EXPORT_BYPASS;Kroky zpracování pro přeskočení
 EXPORT_BYPASS_ALL;Vybrat / Zrušit výběr všeho
@@ -271,6 +273,7 @@ GENERAL_PORTRAIT;Na výšku
 GENERAL_SAVE;Uložit
 GENERAL_UNCHANGED;(Beze změny)
 GENERAL_WARNING;Varování
+GIMP_PLUGIN_INFO;Vítejte v RawTherapee doplňku pro GIMP!\nPo dokončení úprav prostě zavřete hlavní okno RawTherapee a obrázek bude automaticky načten GIMPem.
 HISTOGRAM_TOOLTIP_B;Skrýt/Zobrazit histogram modré.
 HISTOGRAM_TOOLTIP_BAR;Skrýt/Zobrazit řádek RGB indikátoru\nKlikněte pravým tlačítkem myši na náhled pro zmrazení/uvolnění.
 HISTOGRAM_TOOLTIP_CHRO;Skrýt/Zobrazit histogram barevnosti.
@@ -316,9 +319,9 @@ HISTORY_MSG_30;RLD - Poloměr
 HISTORY_MSG_31;RLD - Míra
 HISTORY_MSG_32;RLD - Útlum
 HISTORY_MSG_33;RLD - Průchody
-HISTORY_MSG_34;LCP korekce zkreslení
-HISTORY_MSG_35;LCP korekce vinětace
-HISTORY_MSG_36;LCP korekce CA
+HISTORY_MSG_34;Korekce objektivu - Zkreslení
+HISTORY_MSG_35;Korekce objektivu - Vinětace
+HISTORY_MSG_36;Korekce objektivu - ChA
 HISTORY_MSG_37;Expozice - Automatické úrovně
 HISTORY_MSG_38;Vyvážení bílé - Metoda
 HISTORY_MSG_39;VB - Teplota
@@ -367,7 +370,7 @@ HISTORY_MSG_81;Změna velikosti
 HISTORY_MSG_82;Profil změněn
 HISTORY_MSG_83;S/S - Maska ostrosti
 HISTORY_MSG_84;Korekce perspektivy
-HISTORY_MSG_85;LCP
+HISTORY_MSG_85;Korekce objektivu - LCP soubor
 HISTORY_MSG_86;RGB křivky - Režim svítivost
 HISTORY_MSG_87;Redukce impulzního šumu
 HISTORY_MSG_88;Redukce impulzního šumu - práh
@@ -741,6 +744,23 @@ HISTORY_MSG_472;PS - plynulé přechody
 HISTORY_MSG_473;PS - Použít LMMSE
 HISTORY_MSG_474;PS - korekce
 HISTORY_MSG_475;PS - korekce kanálu
+HISTORY_MSG_476;CAM02 - Teplota (výstup)
+HISTORY_MSG_477;CAM02 - Zelená (výstup)
+HISTORY_MSG_478;CAM02 - Yb (výstup)
+HISTORY_MSG_479;CAM02 - CAT02 přizpůsobení (výstup)
+HISTORY_MSG_480;CAM02 - Automatická CAT02 (výstup)
+HISTORY_MSG_481;CAM02 - Teplota scény
+HISTORY_MSG_482;CAM02 - Zelená scény
+HISTORY_MSG_483;CAM02 - Yb scény
+HISTORY_MSG_484;CAT02 - Automatická Yb scény
+HISTORY_MSG_485;Korekce objektivu
+HISTORY_MSG_486;Korekce objektivu - Fotoaparát
+HISTORY_MSG_487;Korekce objektivu - Objektiv
+HISTORY_MSG_488;HDR Mapování tónů
+HISTORY_MSG_489;HDR TM - Práh
+HISTORY_MSG_490;HDR TM - Míra
+HISTORY_MSG_491;Vyvážení bílé
+HISTORY_MSG_492;RGB křivky
 HISTORY_NEWSNAPSHOT;Přidat
 HISTORY_NEWSNAPSHOT_TOOLTIP;Zkratka: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snímek
@@ -787,6 +807,10 @@ IPTCPANEL_TITLE;Titulek
 IPTCPANEL_TITLEHINT;Vložte krátké, popisné a lidsky čitelné jméno obrázku. Například název souboru.
 IPTCPANEL_TRANSREFERENCE;Číslo úlohy
 IPTCPANEL_TRANSREFERENCEHINT;Zadejte číslo nebo identifikátor potřebný v pracovním postupu nebo pro sledování.
+LENSPROFILE_CORRECTION_AUTOMATCH;Automatický dohledané korekční parametry
+LENSPROFILE_CORRECTION_LCPFILE;LCP Soubor
+LENSPROFILE_CORRECTION_MANUAL;Ruční korekční parametry
+LENSPROFILE_LENS_WARNING;Varování: crop factor použitý pro profilování objektivu je větší než crop factor fotoaparátu. Výsledek může být nesprávný.
 MAIN_BUTTON_FULLSCREEN;Celá obrazovka
 MAIN_BUTTON_NAVNEXT_TOOLTIP;Přejít k dalšímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: <b>Shift-F4</b>\n\nPřejít k dalšímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: <b>F4</b>
 MAIN_BUTTON_NAVPREV_TOOLTIP;Přejít k předchozímu obrázku relativnímu k obrázku otevřenému v editoru.\nZkratka: <b>Shift-F3</b>\n\nPřejít k předchozímu obrázku relativnímu k vybranému náhledu v prohlížeči souborů nebo na filmovém pásu:\nZkratka: <b>F3</b>
@@ -845,6 +869,7 @@ MAIN_TAB_WAVELET_TOOLTIP;Zkratka: <b>Alt-w</b>
 MAIN_TOOLTIP_BACKCOLOR0;Barva pozadí náhledu: <b>Dle motivu</b>\nZkratka: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR1;Barva pozadí náhledu: <b>Černá</b>\nZkratka: <b>9</b>
 MAIN_TOOLTIP_BACKCOLOR2;Barva pozadí náhledu: <b>Bílá</b>\nZkratka: <b>9</b>
+MAIN_TOOLTIP_BACKCOLOR3;Barva pozadí náhledu: <b>Středně šedá</b>\nZkratka: <b>9</b>
 MAIN_TOOLTIP_BEFOREAFTERLOCK;<b>Zamknout</b> / <b>Odemknout</b> pohled <b>Před</b>\n\n<b>Zamknout</b>: ponechá pohled <b>Před</b> nezměněn.\nUžitečné pro posouzení výsledného efektu po použití více nástrojů.\nNavíc může být porovnání provedeno proti kterémukoli stavu v historii.\n\n<b>Odemknout</b>: pohled <b>Před</b> bude následovat pohled <b>Poté</b>, vždy jen o jeden krok zpět, představí vliv právě použitého nástroje.
 MAIN_TOOLTIP_HIDEHP;Zobrazit či schovat levý panel (obsahující historii).\nZkratka: <b>l</b>
 MAIN_TOOLTIP_INDCLIPPEDH;Zvýraznit oříznutá světla.\nZkratka: <b>&lt;</b>
@@ -912,7 +937,7 @@ PARTIALPASTE_IMPULSEDENOISE;Redukce impulzního šumu
 PARTIALPASTE_IPTCINFO;IPTC
 PARTIALPASTE_LABCURVE;L*a*b* úpravy
 PARTIALPASTE_LENSGROUP;Nastavení související s objektivy
-PARTIALPASTE_LENSPROFILE;Korekční profil objektivu
+PARTIALPASTE_LENSPROFILE;Korekční profily objektivů
 PARTIALPASTE_METAGROUP;Metadata
 PARTIALPASTE_PCVIGNETTE;Viněta
 PARTIALPASTE_PERSPECTIVE;Perspektiva
@@ -933,7 +958,7 @@ PARTIALPASTE_RAW_DMETHOD;Metoda demozajkování
 PARTIALPASTE_RAW_FALSECOLOR;Potlačení chybných barev
 PARTIALPASTE_RAW_IMAGENUM;Dílčí snímek
 PARTIALPASTE_RAW_LMMSEITERATIONS;Kroky rozšíření LMMSE
-PARTIALPASTE_RAW_PIXELSHIFT;PixelShift
+PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
 PARTIALPASTE_RESIZE;Změna velikosti
 PARTIALPASTE_RETINEX;Retinex
 PARTIALPASTE_RGBCURVES;RGB křivky
@@ -942,6 +967,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Stíny/Světla
 PARTIALPASTE_SHARPENEDGE;Hrany
 PARTIALPASTE_SHARPENING;Doostření (USM/RL)
 PARTIALPASTE_SHARPENMICRO;Mikrokontrast
+PARTIALPASTE_TM_FATTAL;HDR mapování tónů
 PARTIALPASTE_VIBRANCE;Živost
 PARTIALPASTE_VIGNETTING;Korekce vinětace
 PARTIALPASTE_WAVELETGROUP;Úrovně vlnky
@@ -954,6 +980,7 @@ PREFERENCES_AUTLISSTD;Vysoké
 PREFERENCES_AUTLISVLOW;Ne
 PREFERENCES_AUTLOW;Nízká
 PREFERENCES_AUTOMONPROFILE;Použít barevný profil hlavního monitoru z operačního systému
+PREFERENCES_AUTOSAVE_TP_OPEN;Před ukončením automaticky uložit\nstav sbalení/rozbalení nástrojů.
 PREFERENCES_AUTSTD;Běžná
 PREFERENCES_BATCH_PROCESSING;Dávkové zpracování
 PREFERENCES_BEHADDALL;Vše do 'Přidat'
@@ -989,18 +1016,20 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Jméno
 PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
 PREFERENCES_CUSTPROFBUILDPATH;Cesta k programu
 PREFERENCES_CUTOVERLAYBRUSH;Barva masky ořezu/průhlednosti
-PREFERENCES_D50;5000K
+PREFERENCES_D50;Nastavení v hlavní nabídce
+PREFERENCES_D50_OLD;5000K
 PREFERENCES_D55;5500K
 PREFERENCES_D60;6000K
 PREFERENCES_D65;6500K
 PREFERENCES_DARKFRAMEFOUND;Nalezeno
 PREFERENCES_DARKFRAMESHOTS;snímků
-PREFERENCES_DARKFRAMETEMPLATES;šablon
+PREFERENCES_DARKFRAMETEMPLATES;šablony
 PREFERENCES_DATEFORMAT;Formát data
 PREFERENCES_DATEFORMATHINT;Lze použít následující formátovací řetězce:\n<b>%y</b>\t- rok (year)\n<b>%m</b>\t- měsíc (month)\n<b>%d</b>\t- den (day)\n\nNapříklad český formát data:\n<b>%d. %m. %y</b>
 PREFERENCES_DAUB_LABEL;Použít D6 Daubechiesové vlnky namísto D4
 PREFERENCES_DAUB_TOOLTIP;Nástroje Redukce šumu a Úrovně vlnky používají Daubechiesové mateřskou vlnku. Pokud místo D4 vyberete D6 zvýší se počet ortogonálních Daubechiesové koeficientů a pravděpodobně zvýší kvalitu úrovní malého měřítka. Není zde rozdíl ve spotřebě paměti nebo délce zpracování.
 PREFERENCES_DIRDARKFRAMES;Složka tmavých snímků
+PREFERENCES_DIRECTORIES;Složky
 PREFERENCES_DIRHOME;Domovská složka
 PREFERENCES_DIRLAST;Poslední navštívená složka
 PREFERENCES_DIROTHER;Jiná
@@ -1016,7 +1045,7 @@ PREFERENCES_FILEFORMAT;Formát souboru
 PREFERENCES_FLATFIELDFOUND;Nalezeno
 PREFERENCES_FLATFIELDSDIR;Složka Flat Field souborů
 PREFERENCES_FLATFIELDSHOTS;snímků
-PREFERENCES_FLATFIELDTEMPLATES;šablon
+PREFERENCES_FLATFIELDTEMPLATES;šablony
 PREFERENCES_FLUOF2;Fluorescenční F2
 PREFERENCES_FLUOF7;Fluorescenční F7
 PREFERENCES_FLUOF11;Fluorescenční F11
@@ -1029,7 +1058,8 @@ PREFERENCES_GREY;Yb svítivost výstupního zařízení (%)
 PREFERENCES_GREY05;Yb=05 CIE L#30
 PREFERENCES_GREY10;Yb=10 CIE L#40
 PREFERENCES_GREY15;Yb=15 CIE L#45
-PREFERENCES_GREY18;Yb=18 CIE L#50
+PREFERENCES_GREY18;Nastavení v hlavní nabídce
+PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
 PREFERENCES_GREY23;Yb=23 CIE L#55
 PREFERENCES_GREY30;Yb=30 CIE L#60
 PREFERENCES_GREY40;Yb=40 CIE L#70
@@ -1051,6 +1081,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Vnímání
 PREFERENCES_INTENT_RELATIVE;Relativní kolorimetrie
 PREFERENCES_INTENT_SATURATION;Nasycení
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Ukázat vložené JPEG náhledy u needitovaných snímků
+PREFERENCES_LANG;Jazyk
 PREFERENCES_LANGAUTODETECT;Použít systémový jazyk
 PREFERENCES_LEVAUTDN;Úroveň odšumění
 PREFERENCES_LEVDN;Velikost buňky
@@ -1112,6 +1143,7 @@ PREFERENCES_REMEMBERZOOMPAN;Zapamatovat si procento přiblížení a posun obrá
 PREFERENCES_REMEMBERZOOMPAN_TOOLTIP;Zapamatovat si procento přiblížení a posun aktuálního obrázku a použít tyto hodnoty při otevírání nového obrázku.\n\nTato volba funguje pouze v režimu "Mód jedné karty editoru" a volba "Metoda demozajkování pro náhled při přiblížení menším než 100%" je nastavena na "Stejně jako v PP3".
 PREFERENCES_RGBDTL_LABEL;Maximální počet vláken pro redukci šumu a úrovně vlnky
 PREFERENCES_RGBDTL_TOOLTIP;Pro automatické nastavení maximálního možného počtu vláken ponechte nastaveno na "0". Čím více vláken běží paralelně, tím rychlejší je výpočet. Paměťové nároky najdete na RawPedii.
+PREFERENCES_SAVE_TP_OPEN_NOW;Uložit stav sbalení/rozbalení nástrojů hned
 PREFERENCES_SELECTFONT;Vyberte hlavní písmo
 PREFERENCES_SELECTFONT_COLPICKER;Vybrat písmo pro Průzkumníka barev
 PREFERENCES_SELECTLANG;Volba jazyka
@@ -1142,6 +1174,7 @@ PREFERENCES_TAB_GENERAL;Obecné
 PREFERENCES_TAB_IMPROC;Zpracování obrázku
 PREFERENCES_TAB_PERFORMANCE;Výkon a kvalita
 PREFERENCES_TAB_SOUND;Zvuky
+PREFERENCES_THEME;Vzhled
 PREFERENCES_TIMAX;Vysoký
 PREFERENCES_TINB;Počet dlaždic
 PREFERENCES_TISTD;Běžný
@@ -1165,7 +1198,7 @@ PROFILEPANEL_MODE_TIP;Režim uplatnění profilu zpracování.\n\nTlačítko je
 PROFILEPANEL_MYPROFILES;Mé profily
 PROFILEPANEL_PASTEPPASTE;Parametry pro vložení
 PROFILEPANEL_PCUSTOM;Vlastní
-PROFILEPANEL_PDYNAMIC;Dynamiký
+PROFILEPANEL_PDYNAMIC;Dynamický
 PROFILEPANEL_PFILE;Ze souboru
 PROFILEPANEL_PINTERNAL;Neutrální
 PROFILEPANEL_PLASTSAVED;Poslední uschovaný
@@ -1189,13 +1222,21 @@ PROGRESSBAR_SAVEPNG;Ukládání PNG souboru...
 PROGRESSBAR_SAVETIFF;Ukládání TIFF souboru...
 PROGRESSBAR_SNAPSHOT_ADDED;Snímek přidán
 PROGRESSDLG_PROFILECHANGEDINBROWSER;Profil upracování změněn v prohlížeči
+QINFO_FRAMECOUNT;%2 snímků
+QINFO_HDR;HDR / %2 snímků
 QINFO_ISO;ISO
 QINFO_NOEXIF;Exif údaje nejsou k dispozici.
+QINFO_PIXELSHIFT;Pixel Shift / %2 snímků
+SAMPLEFORMAT_0;Neznámý datový formát
+SAMPLEFORMAT_1;Neznaménkový, 8 bitů
+SAMPLEFORMAT_2;Neznaménkový, 16 bitů
+SAMPLEFORMAT_4;LogLuv, 24 bitů
+SAMPLEFORMAT_8;LogLuv, 32 bitů
+SAMPLEFORMAT_16;S pohyblivou čárkou, 32 bitů
 SAVEDLG_AUTOSUFFIX;Automaticky přidat příponu pokud soubor již existuje
 SAVEDLG_FILEFORMAT;Formát souboru
 SAVEDLG_FORCEFORMATOPTS;Vynutit volby uložení
 SAVEDLG_JPEGQUAL;Kvalita JPEG
-SAVEDLG_PNGCOMPR;PNG Komprese
 SAVEDLG_PUTTOQUEUE;Vložit soubor do fronty
 SAVEDLG_PUTTOQUEUEHEAD;Vložit na začátek fronty
 SAVEDLG_PUTTOQUEUETAIL;Vložit na konec fronty
@@ -1209,8 +1250,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Nejlepší komprese:\nJ:a:b 4:2:0\nh/v 2/2\nO polovinu s
 SAVEDLG_TIFFUNCOMPRESSED;Nekomprimovaný TIFF
 SAVEDLG_WARNFILENAME;Soubor bude pojmenován
 SHCSELECTOR_TOOLTIP;Klikněte pravým tlačítkem myši pro obnovení výchozí pozice těchto tří posuvníků.
-SOFTPROOF_GAMUTCHECK_TOOLTIP;Pokud je aktivní, budou pixely mimo barevnou paletu výstupního profilu označeny šedou barvou.
-SOFTPROOF_TOOLTIP;Jemně korekční\nPokud je aktivní, umožní vám simulovat vykreslení dle výstupního profilu ICM. Nejužitečnější pro simulaci tiskového výstupu.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Pokud je aktivní, budou pixely mimo barevnou paletu profilu tiskárnyoznačeny šedou barvou.
+SOFTPROOF_TOOLTIP;Jemně korekční\nPokud je aktivní, umožní vám simulovat výstup tiskárny pomocí profilu tiskárny nastaveného v Volby > Správa barev.
 THRESHOLDSELECTOR_B;Dole
 THRESHOLDSELECTOR_BL;Dole vlevo
 THRESHOLDSELECTOR_BR;Dole vpravo
@@ -1299,11 +1340,11 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Překlopit horizontálně.
 TP_COARSETRAF_TOOLTIP_ROTLEFT;Otočit doleva.\n\nZkratky:\n<b>[</b> - režim více karet editoru,\n<b>Alt-[</b>- režim jedné karty editoru.
 TP_COARSETRAF_TOOLTIP_ROTRIGHT;Otočit doprava.\n\nZkratky:\n<b>]</b> - režim více karet editoru,\n<b>Alt-]</b>- režim jedné karty editoru.
 TP_COARSETRAF_TOOLTIP_VFLIP;Překlopit vertikálně.
-TP_COLORAPP_ADAPTSCENE;Svítivost scény
-TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolutní jas scény prostředí(cd/m²).\n 1) Vypočítáno z Exifu:\nRychlost závěrky - citlivost - clona - expoziční korekce fotoaparátu.\n 2) Vypočítáno z hodnoty raw bílého bodu a expoziční kompenzace Rawtherapee.
-TP_COLORAPP_ADAPTVIEWING;Svítivost prohlížení (cd/m²)
+TP_COLORAPP_ADAPTSCENE;Absolutní jas scény
+TP_COLORAPP_ADAPTSCENE_TOOLTIP;Absolutní jas scény prostředí (cd/m²).\n 1) Vypočítáno z Exifu:\nRychlost závěrky - citlivost - clona - expoziční korekce fotoaparátu.\n 2) Vypočítáno z hodnoty raw bílého bodu a expoziční kompenzace Rawtherapee.
+TP_COLORAPP_ADAPTVIEWING;Absolutní jas prohlížení (cd/m²)
 TP_COLORAPP_ADAPTVIEWING_TOOLTIP;Absolutní jas prostředí prohlížení\n(obvykle 16cd/m²).
-TP_COLORAPP_ADAP_AUTO_TOOLTIP;Pokud je povoleno (doporučeno), RT vypočítá optimální hodnotu z Exif dat.\nPokud si přejete zadat hodnotu ručně, nejprve zrušte zatržení tohoto pole. 
+TP_COLORAPP_ADAP_AUTO_TOOLTIP;Pokud je povoleno (doporučeno), RawTherapee vypočítá optimální hodnotu z Exif dat.\nPokud si přejete zadat hodnotu ručně, nejprve zrušte zatržení tohoto pole. 
 TP_COLORAPP_ALGO;Algoritmus
 TP_COLORAPP_ALGO_ALL;Vše
 TP_COLORAPP_ALGO_JC;Světlost + Barevnost (JC)
@@ -1323,8 +1364,8 @@ TP_COLORAPP_CHROMA_TOOLTIP;Barevnost se v CIECAM02 liší od barevnosti L*a*b* a
 TP_COLORAPP_CIECAT_DEGREE;CAT02 přizpůsobení
 TP_COLORAPP_CONTRAST;Kontrast (I)
 TP_COLORAPP_CONTRAST_Q;Kontrast (O)
-TP_COLORAPP_CONTRAST_Q_TOOLTIP;Kontrast pro posuvník Q se v CIECAM02 liší od kontrastu L*a*b* a RGB.
-TP_COLORAPP_CONTRAST_TOOLTIP;Kontrast pro posuvník J se v CIECAM02 liší od kontrastu L*a*b* a RGB.
+TP_COLORAPP_CONTRAST_Q_TOOLTIP;Liší se od kontrastu L*a*b* a RGB.
+TP_COLORAPP_CONTRAST_TOOLTIP;Liší se od kontrastu L*a*b* a RGB.
 TP_COLORAPP_CURVEEDITOR1;Tónová křivka 1
 TP_COLORAPP_CURVEEDITOR1_TOOLTIP;Zobrazuje histogram L* (L*a*b*) křivky před CIECAM02.\nPokud je volba "Zobrazit CIECAM02 histogramy výstupu v křivkách" povolena, zobrazí histogram J nebo Q po CIECAM02 .\n\nJ a Q histogramy nejsou na hlavním panelu zobrazeny.\n\nHistogram konečného výsledku je zobrazen na hlavním panelu.
 TP_COLORAPP_CURVEEDITOR2;Tónová křivka 2
@@ -1335,6 +1376,7 @@ TP_COLORAPP_DATACIE;CIECAM02 histogramy výstupu v křivkách
 TP_COLORAPP_DATACIE_TOOLTIP;Pokud je povoleno, zobrazuje histogram v CIECAM02 křivkách přibližné hodnoty/rozsahy po CIECAM02 úpravách J nebo Q, a C, S nebo M.\nVýběr neovlivňuje histogram na hlavním panelu.\n\nPokud je zakázáno, zobrazuje histogram v CIECAM02 křivkách L*a*b* hodnoty před CIECAM02 úpravami.
 TP_COLORAPP_DEGREE_AUTO_TOOLTIP;Pokud je povoleno (doporučeno), RawTherapee vypočítá optimální hodnotu, jenž následně používá jak CAT02 tak i celý CIECAM02.\nZakažte, pokud si přejete zadat hodnotu ručně (doporučeny jsou hodnoty nad 65).
 TP_COLORAPP_DEGREE_TOOLTIP;Míra CIE Chromatic Adaptation Transform 2002.
+TP_COLORAPP_FREE;Volná teplota + zelená + CAT02 + [výstup]
 TP_COLORAPP_GAMUT;Kontrola palety (L*a*b*)
 TP_COLORAPP_GAMUT_TOOLTIP;Povolí kontrolu palety v L*a*b* režimu.
 TP_COLORAPP_HUE;Odstín (h)
@@ -1346,7 +1388,9 @@ TP_COLORAPP_LABEL_VIEWING;Podmínky zobrazení
 TP_COLORAPP_LIGHT;Světlost (I)
 TP_COLORAPP_LIGHT_TOOLTIP;Světlost v CIECAM02 se liší od světlosti v L*a*b* a RGB.
 TP_COLORAPP_MODEL;VB - Model
-TP_COLORAPP_MODEL_TOOLTIP;Model bílého bodu.\n\n<b>WB [RT] + [výstup]</b>: Pro scénu je použito vyvážení bílé RT , CIECAM02 je nastaven na D50 a vyvážení bílé výstupního zařízení je nastaveno ve <i>Volby > Správa barev</i>.\n\n<b>WB [RT+CAT02] + [výstup]</b>: CAT02 používá RT nastavení vyvážení bílé a vyvážení bílé výstupního zařízení je nastaveno ve <i>Volby > Správa barev</i>.
+TP_COLORAPP_MODEL_TOOLTIP;Model bílého bodu.\n\n<b>WB [RT] + [výstup]</b>: Pro scénu je použito vyvážení bílé RawTherapee , CIECAM02 je nastaven na D50 a vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení.\n\n<b>WB [RT+CAT02] + [výstup]</b>: CAT02 používá RawTherapee nastavení vyvážení bílé a vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení.\n\n<b>Volná teplota+zelená + CAT02 + [výstup]:</b> teplota a zelená je vybrána uživatelem, vyvážení bílé výstupního zařízení je nastaveno v Podmínkách prohlížení.
+TP_COLORAPP_NEUTRAL;Obnovit
+TP_COLORAPP_NEUTRAL_TIP;Obnoví původní hodnoty u všech posuvníků a křivek.
 TP_COLORAPP_RSTPRO;Ochrana červených a pleťových tónů
 TP_COLORAPP_RSTPRO_TOOLTIP;Ochrana červených a pleťových tónů ovlivňuje posuvníky i křivky.
 TP_COLORAPP_SHARPCIE;--nepoužito--
@@ -1367,10 +1411,14 @@ TP_COLORAPP_TCMODE_LABEL2;Mód křivky 2
 TP_COLORAPP_TCMODE_LABEL3;Mód barevné křivky
 TP_COLORAPP_TCMODE_LIGHTNESS;Světlost
 TP_COLORAPP_TCMODE_SATUR;Nasycení
+TP_COLORAPP_TEMP_TOOLTIP;Pro výběr osvětlení vždy nastavte Tint=1.\n\nA barva=2856\nD50 barva=5003\nD55 barva=5503\nD65 barva=6504\nD75 barva=7504
 TP_COLORAPP_TONECIE;Mapování tónů pomocí CIECAM02
 TP_COLORAPP_TONECIE_TOOLTIP;Pokud je volba zakázána, probíhá mapování tónů v prostoru L*a*b*.\nPokud je volba povolena. probíhá mapování tónů pomocí CIECAM02.\nAby měla tato volba efekt, musí být povolen nástroj Mapování tónů.
 TP_COLORAPP_WBCAM;WB [RT+CAT02] + [výstup]
 TP_COLORAPP_WBRT;WB [RT] + [výstup]
+TP_COLORAPP_YB;Yb% (střední jas)
+TP_COLORAPP_YBSCENE;Yb% (střední jas)
+TP_COLORAPP_YBSCENE_TOOLTIP;Pokud je povolena automatika, Yb je vypočteno ze střední hodnoty jasu aktuálního obrázku 
 TP_COLORTONING_AB;o C/L
 TP_COLORTONING_AUTOSAT;Automaticky
 TP_COLORTONING_BALANCE;Vyvážené
@@ -1587,7 +1635,7 @@ TP_HSVEQUALIZER_LABEL;HSV korekce
 TP_HSVEQUALIZER_SAT;S
 TP_HSVEQUALIZER_VAL;V
 TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Základní expozice
-TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Použije vložený DCP základní posun expozice. Toto nastavení je dostupné pouze ji pokud DCP obsahuje.
+TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Použije vložený DCP základní posun expozice. Toto nastavení je dostupné pouze pokud ji vybrané DCP obsahuje.
 TP_ICM_APPLYHUESATMAP;Základní tabulka
 TP_ICM_APPLYHUESATMAP_TOOLTIP;Použije vloženou DCP základní tabulku (HueSatMap). Toto nastavení je dostupné pouze pokud ji vybrané DCP obsahuje.
 TP_ICM_APPLYLOOKTABLE;Tabulka vzhledu
@@ -1597,7 +1645,7 @@ TP_ICM_BLENDCMSMATRIX_TOOLTIP;Povolit obnovení vypálených jasů při použit
 TP_ICM_BPC;Kompenzace černého bodu
 TP_ICM_DCPILLUMINANT;Osvětlení
 TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolované
-TP_ICM_DCPILLUMINANT_TOOLTIP;Vyberte které vložené DCP osvětlení se má použít. Ve výchozím stavu se použije "interpolované", což je mix mezi dvěma osvětleními založenými na vyvážení bílé. Nastavené je dostupné pouze v případě, že je povoleno dvojité DCP osvětlení s podporou interpolace.
+TP_ICM_DCPILLUMINANT_TOOLTIP;Vyberte které vložené DCP osvětlení se má použít. Ve výchozím stavu se použije "interpolované", což je mix mezi dvěma osvětleními založenými na vyvážení bílé. Nastavené je povoleno pouze v případě, že je vybráno\t dvojité DCP osvětlení s podporou interpolace.
 TP_ICM_INPUTCAMERA;Standard fotoaparátu
 TP_ICM_INPUTCAMERAICC;Automatický dohledaný profil fotoaparátu
 TP_ICM_INPUTCAMERAICC_TOOLTIP;Použít RawTherapee specifický DCP nebo ICC vstupní barevný profil fotoaparátu jenž je mnohem přesnější než zjednodušená matice. Není dostupné pro všechny fotoaparáty. Profily jsou uloženy ve složkách /iccprofiles/input a /dcpprofiles a jsou automaticky vybrány dle jména souboru shodného s fotoaparátem.
@@ -1619,7 +1667,7 @@ TP_ICM_SAVEREFERENCE_APPLYWB;Aplikovat vyvážení bílé
 TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Obecně se vyvážení bílé aplikuje při ukládání obrázku pro vytvoření ICC profilů a neaplikuje při vytváření DCP profilů.
 TP_ICM_SAVEREFERENCE_TOOLTIP;Uloží lineární TIFF obrázek před aplikováním vstupního profilu. Výsledek může být použit pro kalibraci a generování profilu fotoaparátu.
 TP_ICM_TONECURVE;Tónová křivka
-TP_ICM_TONECURVE_TOOLTIP;Použije vloženou DCP tónovou křivku. Nastavení je dostupné pouze v případě, že DCP obsahuje tónovou křivku.
+TP_ICM_TONECURVE_TOOLTIP;Použije vloženou DCP tónovou křivku. Nastavení je dostupné pouze v případě, že vybrané DCP obsahuje tónovou křivku.
 TP_ICM_WORKINGPROFILE;Pracovní barevný prostor
 TP_IMPULSEDENOISE_LABEL;Redukce impulzního šumu
 TP_IMPULSEDENOISE_THRESH;Práh
@@ -1663,7 +1711,7 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Pracuje s posuvníkem barevnosti a CC křivkou.
 TP_LENSGEOM_AUTOCROP;Automatický ořez
 TP_LENSGEOM_FILL;Automatické vyplnění
 TP_LENSGEOM_LABEL;Objektiv / Geometrie
-TP_LENSPROFILE_LABEL;Korekční profil objektivu
+TP_LENSPROFILE_LABEL;Korekční profily objektivů
 TP_LENSPROFILE_USECA;Korekce chromatické aberace
 TP_LENSPROFILE_USEDIST;Korekce zkreslení
 TP_LENSPROFILE_USEVIGN;Korekce vinětace
@@ -1779,6 +1827,7 @@ TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Vyhlazení přechodů mezi oblastmi s pohybem a
 TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev faktor modrý
 TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev faktor zelený
 TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev faktor červený
+TP_RAW_RCD;RCD
 TP_RAW_SENSOR_BAYER_LABEL;Snímač s Bayerovou maskou
 TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Tří průchodová dává lepší výsledky (doporučeno pro fotky s nízkým ISO).\nJednoprůchodová je téměř k nerozeznání od tří průchodové pro vysoké ISO a je rychlejší.
 TP_RAW_SENSOR_XTRANS_LABEL;Senzory s X-Trans maticí
@@ -1919,6 +1968,9 @@ TP_SHARPENMICRO_AMOUNT;Kvantita
 TP_SHARPENMICRO_LABEL;Mikrokontrast
 TP_SHARPENMICRO_MATRIX;Matice 3×3 namísto 5×5
 TP_SHARPENMICRO_UNIFORMITY;Jednolitost
+TP_TM_FATTAL_AMOUNT;Míra
+TP_TM_FATTAL_LABEL;HDR Mapování tónů
+TP_TM_FATTAL_THRESHOLD;Práh
 TP_VIBRANCE_AVOIDCOLORSHIFT;Zabránit posunu barev
 TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
 TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Tóny pleti
@@ -2112,7 +2164,7 @@ TP_WBALANCE_CLOUDY;Zataženo
 TP_WBALANCE_CUSTOM;Vlastní
 TP_WBALANCE_DAYLIGHT;Denní světlo (slunečno)
 TP_WBALANCE_EQBLUERED;Korekce modrá/červená
-TP_WBALANCE_EQBLUERED_TOOLTIP;Umožňuje odchýlení se od normálního chování "vyvážení bílé" pomocí změny vyvážení modré a červené.\nToto může být užitečné v těchto případech:\na) podmínky jsou velmi odlišné od standardních (například pod vodou),\nb) podmínky se velmi liší od podmínek za kterých probíhala kalibrace,\nc) nevhodné snímače nebo ICC profily.
+TP_WBALANCE_EQBLUERED_TOOLTIP;Umožňuje odchýlení se od normálního chování "vyvážení bílé" pomocí změny vyvážení modré a červené.\nToto může být užitečné v těchto případech:\na) podmínky jsou velmi odlišné od běžného osvětlení (například pod vodou),\nb) podmínky se velmi liší od podmínek za kterých probíhala kalibrace,\nc) nevhodné snímače nebo ICC profily.
 TP_WBALANCE_FLASH55;Leica
 TP_WBALANCE_FLASH60;Standard, Canon, Pentax, Olympus
 TP_WBALANCE_FLASH65;Nikon, Panasonic, Sony, Minolta
@@ -2161,58 +2213,3 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: <b>Alt</b>-<b>f</b
 ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit obrázek obrazovce\nZkratka: <b>f</b>
 ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: <b>+</b>
 ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
-
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!DONT_SHOW_AGAIN;Don't show this message again.
-!EXIFPANEL_SHOWALL;Show all
-!GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
-!HISTORY_MSG_476;CAM02 - Temp out
-!HISTORY_MSG_477;CAM02 - Green out
-!HISTORY_MSG_478;CAM02 - Yb out
-!HISTORY_MSG_479;CAM02 - CAT02 adaptation out
-!HISTORY_MSG_480;CAM02 - Automatic CAT02 out
-!HISTORY_MSG_481;CAM02 - Temp scene
-!HISTORY_MSG_482;CAM02 - Green scene
-!HISTORY_MSG_483;CAM02 - Yb scene
-!HISTORY_MSG_484;CAM02 - Auto Yb scene
-!HISTORY_MSG_485;Lens Correction
-!HISTORY_MSG_486;Lens Correction - Camera
-!HISTORY_MSG_487;Lens Correction - Lens
-!HISTORY_MSG_488;HDR Tone Mapping
-!HISTORY_MSG_489;HDR TM - Threshold
-!HISTORY_MSG_490;HDR TM - Amount
-!LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
-!LENSPROFILE_CORRECTION_LCPFILE;LCP File
-!LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
-!LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
-!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
-!PARTIALPASTE_TM_FATTAL;HDR Tone mapping
-!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
-!PREFERENCES_D50_OLD;5000K
-!PREFERENCES_DIRECTORIES;Directories
-!PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
-!PREFERENCES_LANG;Language
-!PREFERENCES_SAVE_TP_OPEN_NOW;Save tools collapsed/expanded state now
-!PREFERENCES_THEME;Theme
-!QINFO_FRAMECOUNT;%2 frames
-!QINFO_HDR;HDR / %2 frame(s)
-!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s)
-!SAMPLEFORMAT_0;Unknown data format
-!SAMPLEFORMAT_1;Unsigned 8 bits
-!SAMPLEFORMAT_2;Unsigned 16 bits
-!SAMPLEFORMAT_4;LogLuv 24 bits
-!SAMPLEFORMAT_8;LogLuv 32 bits
-!SAMPLEFORMAT_16;32 bits floating point
-!TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
-!TP_COLORAPP_NEUTRAL;Reset
-!TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
-!TP_COLORAPP_YB;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
-!TP_TM_FATTAL_AMOUNT;Amount
-!TP_TM_FATTAL_LABEL;HDR Tone Mapping
-!TP_TM_FATTAL_THRESHOLD;Threshold
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 0b619b706..079d4d6d8 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 08da90847..f011096b8 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -46,6 +46,7 @@
 #45 15.10.2017 Erweiterung (TooWaBoo) RT 5.3
 #46 18.10.2017 Erweiterung (TooWaBoo) RT 5.3
 #47 19.11.2017 HDR-Dynamikkompression (TooWaBoo) RT 5.3
+#48 13.12.2017 Erweiterung (TooWaBoo) RT 5.3
 
 ABOUT_TAB_BUILD;Version
 ABOUT_TAB_CREDITS;Danksagungen
@@ -764,6 +765,9 @@ HISTORY_MSG_484;(CIECAM02) - Szene\nAuto Yb%
 HISTORY_MSG_485;(Objektivkorrektur)\nProfil
 HISTORY_MSG_486;(Objektivkorrektur)\nProfil - Kamera
 HISTORY_MSG_487;(Objektivkorrektur)\nProfil - Objektiv
+HISTORY_MSG_488;(HDR-Dynamikkompression)
+HISTORY_MSG_489;(HDR-Dynamikkompression)\nSchwelle
+HISTORY_MSG_490;(HDR-Dynamikkompression)\nIntensität
 HISTORY_NEWSNAPSHOT;Hinzufügen
 HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: <b>Alt</b> + <b>s</b>
 HISTORY_SNAPSHOT;Schnappschuss
@@ -970,6 +974,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Schatten/Lichter
 PARTIALPASTE_SHARPENEDGE;Kantenschärfung
 PARTIALPASTE_SHARPENING;Schärfung
 PARTIALPASTE_SHARPENMICRO;Mikrokontrast
+PARTIALPASTE_TM_FATTAL;HDR-Dynamikkompression
 PARTIALPASTE_VIBRANCE;Dynamik
 PARTIALPASTE_VIGNETTING;Vignettierungskorrektur
 PARTIALPASTE_WAVELETGROUP;Wavelet
@@ -1970,6 +1975,9 @@ TP_SHARPENMICRO_AMOUNT;Intensität
 TP_SHARPENMICRO_LABEL;Mikrokontrast
 TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
 TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
+TP_TM_FATTAL_AMOUNT;Intensität
+TP_TM_FATTAL_LABEL;HDR-Dynamikkompression
+TP_TM_FATTAL_THRESHOLD;Schwelle
 TP_VIBRANCE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
 TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
 TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Hautfarbtöne
@@ -2217,10 +2225,6 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
 ! Untranslated keys follow; remove the ! prefix after an entry is translated.
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
-HISTORY_MSG_488;(HDR-Dynamikkompression)
-HISTORY_MSG_489;(HDR-Dynamikkompression)\nSchwelle
-HISTORY_MSG_490;(HDR-Dynamikkompression)\nIntensität
-PARTIALPASTE_TM_FATTAL;HDR-Dynamikkompression
-TP_TM_FATTAL_AMOUNT;Intensität
-TP_TM_FATTAL_LABEL;HDR-Dynamikkompression
-TP_TM_FATTAL_THRESHOLD;Schwelle
+HISTORY_MSG_491;(Weißabgleich)
+HISTORY_MSG_492;(RGB-Kurven)
+TP_RAW_RCD;RCD
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index e4bbcacd8..ac956b114 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -805,6 +805,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT;Add
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !HISTORY_SNAPSHOT;Snapshot
@@ -1414,14 +1416,14 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1799,6 +1801,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 31093bc2b..f251950ee 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -723,6 +723,8 @@
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT;Add
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !HISTORY_SNAPSHOT;Snapshot
@@ -1373,14 +1375,14 @@
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1789,6 +1791,7 @@
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index ec6dcfb37..f27d211db 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -1711,6 +1711,8 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1864,10 +1866,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_CROP_GTHARMMEANS;Harmonic Means
 !TP_CROP_GTTRIANGLE1;Golden Triangles 1
 !TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1990,6 +1992,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_VNG4;VNG4
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
 !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index 8718554f5..57cdc631a 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index e9efe4005..293ddd6be 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2174,3 +2174,10 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: <b>f</b>
 ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: <b>+</b>
 ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
+!TP_RAW_RCD;RCD
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 4ffc14338..57cd9d0b3 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -974,6 +974,8 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1459,14 +1461,14 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1837,6 +1839,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index ef8717fa3..ed89ba392 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 034d16928..f532f3270 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -1585,6 +1585,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1735,10 +1737,10 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1928,6 +1930,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index ae9ff5b7f..33b81ce8f 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1962,6 +1962,8 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -2045,10 +2047,10 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_DIRPYRDENOISE_3X3;3×3
 !TP_DIRPYRDENOISE_3X3_SOFT;3×3 soft
 !TP_DIRPYRDENOISE_5X5;5×5
@@ -2124,6 +2126,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_VNG4;VNG4
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
 !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 56e1fabb7..cbfa1d6ae 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index abddd957a..da38b0c4c 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -1248,6 +1248,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1612,14 +1614,14 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1908,6 +1910,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 0ea147eb8..6aaa8ce28 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -2156,6 +2156,8 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
 !LENSPROFILE_CORRECTION_LCPFILE;LCP File
 !LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
@@ -2184,13 +2186,14 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
 !TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL;Equalize per channel
 !TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels.
+!TP_RAW_RCD;RCD
 !TP_RETINEX_GAINOFFS;Gain and Offset (brightness)
 !TP_RETINEX_GAINTRANSMISSION;Gain transmission
 !TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce transmission map to achieve luminance.\nAbscissa: transmission -min from 0, mean, and values (max).\nOrdinate: gain.
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 7e68880b8..6a483966c 100644
--- a/rtdata/languages/Norsk BM	
+++ b/rtdata/languages/Norsk BM	
@@ -974,6 +974,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1459,14 +1461,14 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1837,6 +1839,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index 3c54cc184..7af8c1404 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -1668,6 +1668,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1812,10 +1814,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_CROP_GTHARMMEANS;Harmonic Means
 !TP_CROP_GTTRIANGLE1;Golden Triangles 1
 !TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1937,6 +1939,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_VNG4;VNG4
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
 !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 85b9e3f0b..4064a96a2 100644
--- a/rtdata/languages/Polish (Latin Characters)	
+++ b/rtdata/languages/Polish (Latin Characters)	
@@ -1668,6 +1668,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1812,10 +1814,10 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_CROP_GTHARMMEANS;Harmonic Means
 !TP_CROP_GTTRIANGLE1;Golden Triangles 1
 !TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1937,6 +1939,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_VNG4;VNG4
 !TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
 !TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 661f24483..894e5405e 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index a67674975..150ca91e3 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -1528,6 +1528,8 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1725,14 +1727,14 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1930,6 +1932,7 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index b6f614cce..bdc693b54 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -1561,6 +1561,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1727,10 +1729,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1929,6 +1931,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 6feba1bf3..58bcc871d 100644
--- a/rtdata/languages/Serbian (Latin Characters)	
+++ b/rtdata/languages/Serbian (Latin Characters)	
@@ -1561,6 +1561,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -1727,10 +1729,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1929,6 +1931,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index f589c3ee1..c42c22637 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -1037,6 +1037,8 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1499,14 +1501,14 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1849,6 +1851,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index ecdcfff8a..1f14fad7c 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -976,6 +976,8 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1460,14 +1462,14 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1838,6 +1840,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 0f3ddaafd..989207c05 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1955,6 +1955,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
 !IPTCPANEL_COPYRIGHT;Copyright notice
@@ -2027,10 +2029,10 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_COLORAPP_FREE;Free temp+green + CAT02 + [output]
 !TP_COLORAPP_NEUTRAL;Reset
 !TP_COLORAPP_NEUTRAL_TIP;Reset all sliders checkbox and curves to their default values
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Chroma opacity as a function of luminance oC=f(L)
 !TP_COLORTONING_LABEL;Color Toning
 !TP_COLORTONING_METHOD_TOOLTIP;"L*a*b* blending", "RGB sliders" and "RGB curves" use interpolated color blending.\n"Color balance (Shadows/Midtones/Highlights)" and "Saturation 2 colors" use direct colors.\n\nThe Black-and-White tool can be enabled when using any color toning method, which allows for color toning.
@@ -2115,6 +2117,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_VNG4;VNG4
 !TP_RETINEX_CONTEDIT_MAP;Mask equalizer
 !TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 937e0dabb..ac3fa70a0 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -975,6 +975,8 @@ TP_WBALANCE_TEMPERATURE;Isı
 !HISTORY_MSG_488;HDR Tone Mapping
 !HISTORY_MSG_489;HDR TM - Threshold
 !HISTORY_MSG_490;HDR TM - Amount
+!HISTORY_MSG_491;White Balance
+!HISTORY_MSG_492;RGB Curves
 !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
 !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@@ -1459,14 +1461,14 @@ TP_WBALANCE_TEMPERATURE;Isı
 !TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
 !TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
 !TP_COLORAPP_TCMODE_SATUR;Saturation
-!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
+!TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant, always set Tint=1.\n\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
 !TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
 !TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
 !TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
 !TP_COLORAPP_WBRT;WB [RT] + [output]
 !TP_COLORAPP_YB;Yb% (mean luminance)
 !TP_COLORAPP_YBSCENE;Yb% (mean luminance)
-!TP_COLORAPP_YBSCENE_TOOLTIP;if auto enable, Yb is calculated from the mean value of actual image luminance
+!TP_COLORAPP_YBSCENE_TOOLTIP;if auto is enabled, Yb is calculated from the mean value of the actual image's luminance
 !TP_COLORTONING_AB;o C/L
 !TP_COLORTONING_AUTOSAT;Automatic
 !TP_COLORTONING_BALANCE;Balance
@@ -1837,6 +1839,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
 !TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
 !TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
+!TP_RAW_RCD;RCD
 !TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 !TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
 !TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
diff --git a/rtdata/languages/default b/rtdata/languages/default
index efb6c4a31..832c9e264 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -722,6 +722,10 @@ HISTORY_MSG_487;Lens Correction - Lens
 HISTORY_MSG_488;HDR Tone Mapping
 HISTORY_MSG_489;HDR TM - Threshold
 HISTORY_MSG_490;HDR TM - Amount
+HISTORY_MSG_491;White Balance
+HISTORY_MSG_492;RGB Curves
+HISTORY_MSG_493;L*a*b* Adjustments
+HISTORY_MSG_494;PS - Use single green
 HISTORY_NEWSNAPSHOT;Add
 HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
 HISTORY_SNAPSHOT;Snapshot
diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h
index d96e6f5ce..145c8ed20 100644
--- a/rtengine/colortemp.h
+++ b/rtengine/colortemp.h
@@ -21,6 +21,7 @@
 
 #include <cmath>
 #include <map>
+#include <string>
 
 namespace rtengine
 {
diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc
index d83b90cef..16c0204dd 100644
--- a/rtengine/demosaic_algos.cc
+++ b/rtengine/demosaic_algos.cc
@@ -4213,7 +4213,7 @@ void RawImageSource::rcd_demosaic()
         }
     }
 
-    border_interpolate2(width, height, 4);
+    border_interpolate2(width, height, 8);
 
     if (plistener) {
         plistener->setProgress(1);
diff --git a/rtengine/image16.cc b/rtengine/image16.cc
index e0f7470a6..426fc289c 100644
--- a/rtengine/image16.cc
+++ b/rtengine/image16.cc
@@ -137,17 +137,22 @@ void Image16::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Preview
 {
 
     // compute channel multipliers
-    double drm, dgm, dbm;
-    ctemp.getMultipliers (drm, dgm, dbm);
-    float rm = drm, gm = dgm, bm = dbm;
+    float rm = 1.f, gm = 1.f, bm = 1.f;
+    if (ctemp.getTemp() >= 0) {
+        double drm, dgm, dbm;
+        ctemp.getMultipliers (drm, dgm, dbm);
+        rm = drm;
+        gm = dgm;
+        bm = dbm;
 
-    rm = 1.0 / rm;
-    gm = 1.0 / gm;
-    bm = 1.0 / bm;
-    float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
-    rm /= mul_lum;
-    gm /= mul_lum;
-    bm /= mul_lum;
+        rm = 1.0 / rm;
+        gm = 1.0 / gm;
+        bm = 1.0 / bm;
+        float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
+        rm /= mul_lum;
+        gm /= mul_lum;
+        bm /= mul_lum;
+    }
 
     int sx1, sy1, sx2, sy2;
 
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index 56c2a63ee..86294236b 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -97,17 +97,22 @@ Image8* Image8::copy ()
 void Image8::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, procparams::ToneCurveParams hrp)
 {
     // compute channel multipliers
-    double drm, dgm, dbm;
-    ctemp.getMultipliers (drm, dgm, dbm);
-    float rm = drm, gm = dgm, bm = dbm;
+    float rm = 1.f, gm = 1.f, bm = 1.f;
+    if (ctemp.getTemp() >= 0) {
+        double drm, dgm, dbm;
+        ctemp.getMultipliers (drm, dgm, dbm);
+        rm = drm;
+        gm = dgm;
+        bm = dbm;
 
-    rm = 1.0 / rm;
-    gm = 1.0 / gm;
-    bm = 1.0 / bm;
-    float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
-    rm /= mul_lum;
-    gm /= mul_lum;
-    bm /= mul_lum;
+        rm = 1.0 / rm;
+        gm = 1.0 / gm;
+        bm = 1.0 / bm;
+        float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
+        rm /= mul_lum;
+        gm /= mul_lum;
+        bm /= mul_lum;
+    }
 
     int sx1, sy1, sx2, sy2;
 
diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc
index 30871c9b1..d5b17ed80 100644
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -175,17 +175,22 @@ void Imagefloat::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Prev
 {
 
     // compute channel multipliers
-    double drm, dgm, dbm;
-    ctemp.getMultipliers (drm, dgm, dbm);
-    float rm = drm, gm = dgm, bm = dbm;
+    float rm = 1.f, gm = 1.f, bm = 1.f;
+    if (ctemp.getTemp() >= 0) {
+        double drm, dgm, dbm;
+        ctemp.getMultipliers (drm, dgm, dbm);
+        rm = drm;
+        gm = dgm;
+        bm = dbm;
 
-    rm = 1.0 / rm;
-    gm = 1.0 / gm;
-    bm = 1.0 / bm;
-    float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
-    rm /= mul_lum;
-    gm /= mul_lum;
-    bm /= mul_lum;
+        rm = 1.0 / rm;
+        gm = 1.0 / gm;
+        bm = 1.0 / bm;
+        float mul_lum = 0.299 * rm + 0.587 * gm + 0.114 * bm;
+        rm /= mul_lum;
+        gm /= mul_lum;
+        bm /= mul_lum;
+    }
 
     int sx1, sy1, sx2, sy2;
 
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 008344dd7..9c80eed9e 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -296,7 +296,9 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
 
         currWB = ColorTemp (params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
 
-        if (params.wb.method == "Camera") {
+        if (!params.wb.enabled) {
+            currWB = ColorTemp();
+        } else if (params.wb.method == "Camera") {
             currWB = imgsrc->getWB ();
         } else if (params.wb.method == "Auto") {
             if (lastAwbEqual != params.wb.equal || lastAwbTempBias != params.wb.tempBias) {
@@ -320,10 +322,12 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             currWB = autoWB;
         }
 
-        params.wb.temperature = currWB.getTemp ();
-        params.wb.green = currWB.getGreen ();
+        if (params.wb.enabled) {
+            params.wb.temperature = currWB.getTemp ();
+            params.wb.green = currWB.getGreen ();
+        }
 
-        if (params.wb.method == "Auto" && awbListener) {
+        if (params.wb.method == "Auto" && awbListener && params.wb.enabled) {
             awbListener->WBChanged (params.wb.temperature, params.wb.green);
         }
 
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index ad7e4260d..5223a7f85 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -3146,7 +3146,8 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
         {wprof[2][0], wprof[2][1], wprof[2][2]}
     };
 
-    bool mixchannels = (params->chmixer.red[0] != 100 || params->chmixer.red[1] != 0     || params->chmixer.red[2] != 0   ||
+    bool mixchannels = params->chmixer.enabled &&
+        (params->chmixer.red[0] != 100 || params->chmixer.red[1] != 0     || params->chmixer.red[2] != 0   ||
                         params->chmixer.green[0] != 0 || params->chmixer.green[1] != 100 || params->chmixer.green[2] != 0 ||
                         params->chmixer.blue[0] != 0  || params->chmixer.blue[1] != 0    || params->chmixer.blue[2] != 100);
 
@@ -3159,9 +3160,9 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
     FlatCurveType sCurveType = (FlatCurveType)params->hsvequalizer.scurve.at (0);
     FlatCurveType vCurveType = (FlatCurveType)params->hsvequalizer.vcurve.at (0);
     FlatCurveType bwlCurveType = (FlatCurveType)params->blackwhite.luminanceCurve.at (0);
-    bool hCurveEnabled = hCurveType > FCT_Linear;
-    bool sCurveEnabled = sCurveType > FCT_Linear;
-    bool vCurveEnabled = vCurveType > FCT_Linear;
+    bool hCurveEnabled = params->hsvequalizer.enabled && hCurveType > FCT_Linear;
+    bool sCurveEnabled = params->hsvequalizer.enabled && sCurveType > FCT_Linear;
+    bool vCurveEnabled = params->hsvequalizer.enabled && vCurveType > FCT_Linear;
     bool bwlCurveEnabled = bwlCurveType > FCT_Linear;
 
     // TODO: We should create a 'skip' value like for CurveFactory::complexsgnCurve (rtengine/curves.cc)
@@ -3760,7 +3761,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
                     }
                 }
 
-                if (rCurve || gCurve || bCurve) { // if any of the RGB curves is engaged
+                if (params->rgbCurves.enabled && (rCurve || gCurve || bCurve)) { // if any of the RGB curves is engaged
                     if (!params->rgbCurves.lumamode) { // normal RGB mode
 
                         for (int i = istart, ti = 0; i < tH; i++, ti++) {
@@ -5585,6 +5586,10 @@ void ImProcFunctions::luminanceCurve (LabImage* lold, LabImage* lnew, LUTf & cur
 
 SSEFUNCTION void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW, LabImage* lold, LabImage* lnew, LUTf & acurve, LUTf & bcurve, LUTf & satcurve, LUTf & lhskcurve, LUTf & clcurve, LUTf & curve, bool utili, bool autili, bool butili, bool ccutili, bool cclutili, bool clcutili, LUTu &histCCurve, LUTu &histLCurve)
 {
+    if (!params->labCurve.enabled) {
+        return;
+    }
+    
     int W = lold->W;
     int H = lold->H;
     // lhskcurve.dump("lh_curve");
diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc
index 15e68d9f1..baaa88767 100644
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@@ -361,7 +361,7 @@ void rtengine::LCPProfile::calcParams(
             const float focDist = aPersModel[pm]->focDist;
             const float focDistLog = std::log(focDist) + euler;
 
-            double meanErr;
+            double meanErr = 0.0;
 
             if (aPersModel[pm]->hasModeData(mode)) {
                 double lowMeanErr = 0.0;
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index f9b049679..b4bb6be73 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -511,15 +511,16 @@ enum ProcEvent {
     EvCATgreensc = 481,
     EvCATybscen = 482,
     EvCATAutoyb = 483,
-    // profiled lens correction new events
     EvLensCorrMode = 484,
     EvLensCorrLensfunCamera = 485,
     EvLensCorrLensfunLens = 486,
-    // Fattal tone mapping
     EvTMFattalEnabled = 487,
     EvTMFattalThreshold = 488,
     EvTMFattalAmount = 489,
-    EvPixelShiftOneGreen = 490,
+    EvWBEnabled = 490,
+    EvRGBEnabled = 491,
+    EvLEnabled = 492,
+    EvPixelShiftOneGreen = 493,
 
     NUMOFEVENTS
 
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 0137ee7b6..64a3fc67f 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -497,6 +497,7 @@ void RetinexParams::getCurves(RetinextransmissionCurve &transmissionCurveLUT, Re
 }
 
 LCurveParams::LCurveParams() :
+    enabled(false),
     lcurve{
         DCT_Linear
     },
@@ -536,7 +537,8 @@ LCurveParams::LCurveParams() :
 bool LCurveParams::operator ==(const LCurveParams& other) const
 {
     return
-        lcurve == other.lcurve
+        enabled == other.enabled
+        && lcurve == other.lcurve
         && acurve == other.acurve
         && bcurve == other.bcurve
         && cccurve == other.cccurve
@@ -559,6 +561,7 @@ bool LCurveParams::operator !=(const LCurveParams& other) const
 }
 
 RGBCurvesParams::RGBCurvesParams() :
+    enabled(false),
     lumamode(false),
     rcurve{
         DCT_Linear
@@ -575,7 +578,8 @@ RGBCurvesParams::RGBCurvesParams() :
 bool RGBCurvesParams::operator ==(const RGBCurvesParams& other) const
 {
     return
-        lumamode == other.lumamode
+        enabled == other.enabled
+        && lumamode == other.lumamode
         && rcurve == other.rcurve
         && gcurve == other.gcurve
         && bcurve == other.bcurve;
@@ -1094,6 +1098,7 @@ bool VibranceParams::operator !=(const VibranceParams& other) const
 }
 
 WBParams::WBParams() :
+    enabled(true),
     method("Camera"),
     temperature(6504),
     green(1.0),
@@ -1105,7 +1110,8 @@ WBParams::WBParams() :
 bool WBParams::operator ==(const WBParams& other) const
 {
     return
-        method == other.method
+        enabled == other.enabled
+        && method == other.method
         && temperature == other.temperature
         && green == other.green
         && equal == other.equal
@@ -1751,6 +1757,7 @@ bool VignettingParams::operator !=(const VignettingParams& other) const
 }
 
 ChannelMixerParams::ChannelMixerParams() :
+    enabled(false),
     red{
         100,
         0,
@@ -1771,6 +1778,9 @@ ChannelMixerParams::ChannelMixerParams() :
 
 bool ChannelMixerParams::operator ==(const ChannelMixerParams& other) const
 {
+    if (enabled != other.enabled) {
+        return false;
+    }
     for (unsigned int i = 0; i < 3; ++i) {
         if (
             red[i] != other.red[i]
@@ -2259,6 +2269,7 @@ bool DirPyrEqualizerParams::operator !=(const DirPyrEqualizerParams& other) cons
 }
 
 HSVEqualizerParams::HSVEqualizerParams() :
+    enabled(false),
     hcurve{
         FCT_Linear
     },
@@ -2274,7 +2285,8 @@ HSVEqualizerParams::HSVEqualizerParams() :
 bool HSVEqualizerParams::operator ==(const HSVEqualizerParams& other) const
 {
     return
-        hcurve == other.hcurve
+        enabled == other.enabled
+        && hcurve == other.hcurve
         && scurve == other.scurve
         && vcurve == other.vcurve;
 }
@@ -2747,6 +2759,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->retinex.gaintransmissionCurve, "Retinex", "GainTransmissionCurve", retinex.gaintransmissionCurve, keyFile);
 
 // Channel mixer
+        saveToKeyfile(!pedited || pedited->chmixer.enabled, "Channel Mixer", "Enabled", chmixer.enabled, keyFile);
         if (!pedited || pedited->chmixer.red[0] || pedited->chmixer.red[1] || pedited->chmixer.red[2]) {
             Glib::ArrayHandle<int> rmix (chmixer.red, 3, Glib::OWNERSHIP_NONE);
             keyFile.set_integer_list ("Channel Mixer", "Red", rmix);
@@ -2812,6 +2825,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->blackwhite.afterCurve, "Black & White", "AfterCurve", blackwhite.afterCurve, keyFile);
 
 // Luma curve
+        saveToKeyfile(!pedited || pedited->labCurve.enabled, "Luminance Curve", "Enabled", labCurve.enabled, keyFile);
         saveToKeyfile(!pedited || pedited->labCurve.brightness, "Luminance Curve", "Brightness", labCurve.brightness, keyFile);
         saveToKeyfile(!pedited || pedited->labCurve.contrast, "Luminance Curve", "Contrast", labCurve.contrast, keyFile);
         saveToKeyfile(!pedited || pedited->labCurve.chromaticity, "Luminance Curve", "Chromaticity", labCurve.chromaticity, keyFile);
@@ -2867,6 +2881,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->sharpenMicro.uniformity, "SharpenMicro", "Uniformity", sharpenMicro.uniformity, keyFile);
 
 // WB
+        saveToKeyfile(!pedited || pedited->wb.enabled, "White Balance", "Enabled", wb.enabled, keyFile);
         saveToKeyfile(!pedited || pedited->wb.method, "White Balance", "Setting", wb.method, keyFile);
         saveToKeyfile(!pedited || pedited->wb.temperature, "White Balance", "Temperature", wb.temperature, keyFile);
         saveToKeyfile(!pedited || pedited->wb.green, "White Balance", "Green", wb.green, keyFile);
@@ -3092,7 +3107,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->icm.working, "Color Management", "WorkingProfile", icm.working, keyFile);
         saveToKeyfile(!pedited || pedited->icm.output, "Color Management", "OutputProfile", icm.output, keyFile);
         saveToKeyfile(
-            !pedited || icm.outputIntent,
+            !pedited || pedited->icm.outputIntent,
             "Color Management",
             "OutputProfileIntent",
             {
@@ -3226,6 +3241,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->dirpyrequalizer.hueskin, "Directional Pyramid Equalizer", "Hueskin", dirpyrequalizer.hueskin.toVector(), keyFile);
 
 // HSV Equalizer
+        saveToKeyfile(!pedited || pedited->hsvequalizer.enabled, "HSV Equalizer", "Enabled", hsvequalizer.enabled, keyFile);
         saveToKeyfile(!pedited || pedited->hsvequalizer.hcurve, "HSV Equalizer", "HCurve", hsvequalizer.hcurve, keyFile);
         saveToKeyfile(!pedited || pedited->hsvequalizer.scurve, "HSV Equalizer", "SCurve", hsvequalizer.scurve, keyFile);
         saveToKeyfile(!pedited || pedited->hsvequalizer.vcurve, "HSV Equalizer", "VCurve", hsvequalizer.vcurve, keyFile);
@@ -3235,6 +3251,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->filmSimulation.clutFilename, "Film Simulation", "ClutFilename", filmSimulation.clutFilename, keyFile);
         saveToKeyfile(!pedited || pedited->filmSimulation.strength, "Film Simulation", "Strength", filmSimulation.strength, keyFile);
 
+        saveToKeyfile(!pedited || pedited->rgbCurves.enabled, "RGB Curves", "Enabled", rgbCurves.enabled, keyFile);
         saveToKeyfile(!pedited || pedited->rgbCurves.lumamode, "RGB Curves", "LumaMode", rgbCurves.lumamode, keyFile);
         saveToKeyfile(!pedited || pedited->rgbCurves.rcurve, "RGB Curves", "rCurve", rgbCurves.rcurve, keyFile);
         saveToKeyfile(!pedited || pedited->rgbCurves.gcurve, "RGB Curves", "gCurve", rgbCurves.gcurve, keyFile);
@@ -3455,6 +3472,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
         }
 
         if (keyFile.has_group ("Channel Mixer")) {
+            if (ppVersion >= 329) {
+                assignFromKeyfile(keyFile, "Channel Mixer", "Enabled", pedited, chmixer.enabled, pedited->chmixer.enabled);
+            } else {
+                chmixer.enabled = true;
+                if (pedited) {
+                    pedited->chmixer.enabled = true;
+                }
+            }
             if (keyFile.has_key ("Channel Mixer", "Red") && keyFile.has_key ("Channel Mixer", "Green") && keyFile.has_key ("Channel Mixer", "Blue")) {
                 const std::vector<int> rmix = keyFile.get_integer_list ("Channel Mixer", "Red");
                 const std::vector<int> gmix = keyFile.get_integer_list ("Channel Mixer", "Green");
@@ -3570,6 +3595,15 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
         }
 
         if (keyFile.has_group ("Luminance Curve")) {
+            if (ppVersion >= 329) {
+                assignFromKeyfile(keyFile, "Luminance Curve", "Enabled", pedited, labCurve.enabled, pedited->labCurve.enabled);
+            } else {
+                labCurve.enabled = true;
+                if (pedited) {
+                    pedited->labCurve.enabled = true;
+                }
+            }
+            
             assignFromKeyfile(keyFile, "Luminance Curve", "Brightness", pedited, labCurve.brightness, pedited->labCurve.brightness);
             assignFromKeyfile(keyFile, "Luminance Curve", "Contrast", pedited, labCurve.contrast, pedited->labCurve.contrast);
 
@@ -3700,6 +3734,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
         }
 
         if (keyFile.has_group ("White Balance")) {
+            assignFromKeyfile(keyFile, "White Balance", "Enabled", pedited, wb.enabled, pedited->wb.enabled);
             assignFromKeyfile(keyFile, "White Balance", "Setting", pedited, wb.method, pedited->wb.method);
             assignFromKeyfile(keyFile, "White Balance", "Temperature", pedited, wb.temperature, pedited->wb.temperature);
             assignFromKeyfile(keyFile, "White Balance", "Green", pedited, wb.green, pedited->wb.green);
@@ -4392,6 +4427,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
         }
 
         if (keyFile.has_group ("HSV Equalizer")) {
+            if (ppVersion >= 329) {
+                assignFromKeyfile(keyFile, "HSV Equalizer", "Enabled", pedited, hsvequalizer.enabled, pedited->hsvequalizer.enabled);
+            } else {
+                hsvequalizer.enabled = true;
+                if (pedited) {
+                    pedited->hsvequalizer.enabled = true;
+                }
+            }
             if (ppVersion >= 300) {
                 assignFromKeyfile(keyFile, "HSV Equalizer", "HCurve", pedited, hsvequalizer.hcurve, pedited->hsvequalizer.hcurve);
                 assignFromKeyfile(keyFile, "HSV Equalizer", "SCurve", pedited, hsvequalizer.scurve, pedited->hsvequalizer.scurve);
@@ -4400,6 +4443,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
         }
 
         if (keyFile.has_group ("RGB Curves")) {
+            if (ppVersion >= 329) {
+                assignFromKeyfile(keyFile, "RGB Curves", "Enabled", pedited, rgbCurves.enabled, pedited->rgbCurves.enabled);
+            } else {
+                rgbCurves.enabled = true;
+                if (pedited) {
+                    pedited->rgbCurves.enabled = true;
+                }
+            }
             assignFromKeyfile(keyFile, "RGB Curves", "LumaMode", pedited, rgbCurves.lumamode, pedited->rgbCurves.lumamode);
             assignFromKeyfile(keyFile, "RGB Curves", "rCurve", pedited, rgbCurves.rcurve, pedited->rgbCurves.rcurve);
             assignFromKeyfile(keyFile, "RGB Curves", "gCurve", pedited, rgbCurves.gcurve, pedited->rgbCurves.gcurve);
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 3f187d913..6c95b3a7f 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -341,6 +341,7 @@ struct RetinexParams
   */
 struct LCurveParams
 {
+    bool enabled;
     std::vector<double>   lcurve;
     std::vector<double>   acurve;
     std::vector<double>   bcurve;
@@ -367,6 +368,7 @@ struct LCurveParams
   * Parameters of the RGB curves
   */
 struct RGBCurvesParams {
+    bool enabled;
     bool lumamode;
     std::vector<double>   rcurve;
     std::vector<double>   gcurve;
@@ -538,6 +540,7 @@ struct WBEntry {
 };
 
 struct WBParams {
+    bool enabled;
     Glib::ustring   method;
     int             temperature;
     double          green;
@@ -895,6 +898,7 @@ struct VignettingParams {
   * Parameters of the color mixer
   */
 struct ChannelMixerParams {
+    bool enabled;
     int red[3];
     int green[3];
     int blue[3];
@@ -1137,6 +1141,7 @@ struct DirPyrEqualizerParams {
  * HSV equalizer params
  */
 struct HSVEqualizerParams {
+    bool enabled;
     std::vector<double> hcurve;
     std::vector<double> scurve;
     std::vector<double> vcurve;
diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc
index fc1c4b81a..06879fb26 100644
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -517,7 +517,9 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     ALLNORAW,         // EvTMFattalEnabled
     HDR,              // EvTMFattalThreshold
     HDR,              // EvTMFattalAmount
+    ALLNORAW,         // EvWBEnabled
+    RGBCURVE,         // EvRGBEnabled
+    LUMINANCECURVE,   // EvLEnabled
     DEMOSAIC          // EvPixelShiftOneGreen
-
 };
 
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 8adab4ec5..fcc039a81 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -944,7 +944,9 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
     // compute WB multipliers
     ColorTemp currWB = ColorTemp (params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
 
-    if (params.wb.method == "Camera") {
+    if (!params.wb.enabled) {
+        currWB = ColorTemp();
+    } else if (params.wb.method == "Camera") {
         //recall colorMatrix is rgb_cam
         double cam_r = colorMatrix[0][0] * camwbRed + colorMatrix[0][1] * camwbGreen + colorMatrix[0][2] * camwbBlue;
         double cam_g = colorMatrix[1][0] * camwbRed + colorMatrix[1][1] * camwbGreen + colorMatrix[1][2] * camwbBlue;
@@ -954,12 +956,19 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
         currWB = ColorTemp (autoWBTemp, autoWBGreen, wbEqual, "Custom");
     }
 
-    double r, g, b;
-    currWB.getMultipliers (r, g, b);
-    //iColorMatrix is cam_rgb
-    double rm = iColorMatrix[0][0] * r + iColorMatrix[0][1] * g + iColorMatrix[0][2] * b;
-    double gm = iColorMatrix[1][0] * r + iColorMatrix[1][1] * g + iColorMatrix[1][2] * b;
-    double bm = iColorMatrix[2][0] * r + iColorMatrix[2][1] * g + iColorMatrix[2][2] * b;
+    double rm, gm, bm;
+    if (currWB.getTemp() < 0) {
+        rm = redMultiplier;
+        gm = greenMultiplier;
+        bm = blueMultiplier;
+    } else {
+        double r, g, b;
+        currWB.getMultipliers (r, g, b);
+        //iColorMatrix is cam_rgb
+        rm = iColorMatrix[0][0] * r + iColorMatrix[0][1] * g + iColorMatrix[0][2] * b;
+        gm = iColorMatrix[1][0] * r + iColorMatrix[1][1] * g + iColorMatrix[1][2] * b;
+        bm = iColorMatrix[2][0] * r + iColorMatrix[2][1] * g + iColorMatrix[2][2] * b;
+    }
     rm = camwbRed / rm;
     gm = camwbGreen / gm;
     bm = camwbBlue / bm;
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index ece818440..5bcaca925 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -223,7 +223,9 @@ private:
         // set the color temperature
         currWB = ColorTemp (params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
 
-        if (params.wb.method == "Camera") {
+        if (!params.wb.enabled) {
+            currWB = ColorTemp();
+        } else if (params.wb.method == "Camera") {
             currWB = imgsrc->getWB ();
         } else if (params.wb.method == "Auto") {
             double rm, gm, bm;
diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc
index c1ab6f4f2..3b0d9c9ef 100644
--- a/rtexif/canonattribs.cc
+++ b/rtexif/canonattribs.cc
@@ -555,364 +555,366 @@ class CALensInterpreter : public IntLensInterpreter< int >
 public:
     CALensInterpreter ()
     {
-        choices.insert (p_t (1, "Canon EF 50mm f/1.8"));
-        choices.insert (p_t (2, "Canon EF 28mm f/2.8"));
-        choices.insert (p_t (3, "Canon EF 135mm f/2.8 Soft"));
-        choices.insert (p_t (4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens"));
-        choices.insert (p_t (4, "Sigma UC Zoom 35-135mm f/4-5.6"));
-        choices.insert (p_t (5, "Canon EF 35-70mm f/3.5-4.5"));
-        choices.insert (p_t (6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens"));
-        choices.insert (p_t (6, "Sigma 18-50mm f/3.5-5.6 DC"));
-        choices.insert (p_t (6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP"));
-        choices.insert (p_t (6, "Tokina AF 193-2 19-35mm f/3.5-4.5"));
-        choices.insert (p_t (6, "Sigma 28-80mm f/3.5-5.6 II Macro"));
-        choices.insert (p_t (7, "Canon EF 100-300mm f/5.6L"));
-        choices.insert (p_t (8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens"));
-        choices.insert (p_t (8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro"));
-        choices.insert (p_t (8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"));
-        choices.insert (p_t (9, "Canon EF 70-210mm f/4"));
-        choices.insert (p_t (9, "Sigma 55-200mm f/4-5.6 DC"));
-        choices.insert (p_t (10, "Canon EF 50mm f/2.5 Macro or Sigma Lens"));
-        choices.insert (p_t (10, "Sigma 50mm f/2.8 EX"));
-        choices.insert (p_t (10, "Sigma 28mm f/1.8"));
-        choices.insert (p_t (10, "Sigma 105mm f/2.8 Macro EX"));
-        choices.insert (p_t (10, "Sigma 70mm f/2.8 EX DG Macro EF"));
-        choices.insert (p_t (11, "Canon EF 35mm f/2"));
-        choices.insert (p_t (13, "Canon EF 15mm f/2.8 Fisheye"));
-        choices.insert (p_t (14, "Canon EF 50-200mm f/3.5-4.5L"));
-        choices.insert (p_t (15, "Canon EF 50-200mm f/3.5-4.5"));
-        choices.insert (p_t (16, "Canon EF 35-135mm f/3.5-4.5"));
-        choices.insert (p_t (17, "Canon EF 35-70mm f/3.5-4.5A"));
-        choices.insert (p_t (18, "Canon EF 28-70mm f/3.5-4.5"));
-        choices.insert (p_t (20, "Canon EF 100-200mm f/4.5A"));
-        choices.insert (p_t (21, "Canon EF 80-200mm f/2.8L"));
-        choices.insert (p_t (22, "Canon EF 20-35mm f/2.8L or Tokina Lens"));
-        choices.insert (p_t (22, "Tokina AT-X 280 AF Pro 28-80mm f/2.8 Aspherical"));
-        choices.insert (p_t (23, "Canon EF 35-105mm f/3.5-4.5"));
-        choices.insert (p_t (24, "Canon EF 35-80mm f/4-5.6 Power Zoom"));
-        choices.insert (p_t (25, "Canon EF 35-80mm f/4-5.6 Power Zoom"));
-        choices.insert (p_t (26, "Canon EF 100mm f/2.8 Macro or Other Lens"));
-        choices.insert (p_t (26, "Cosina 100mm f/3.5 Macro AF"));
-        choices.insert (p_t (26, "Tamron SP AF 90mm f/2.8 Di Macro"));
-        choices.insert (p_t (26, "Tamron SP AF 180mm f/3.5 Di Macro"));
-        choices.insert (p_t (26, "Carl Zeiss Planar T* 50mm f/1.4"));
-        choices.insert (p_t (27, "Canon EF 35-80mm f/4-5.6"));
-        choices.insert (p_t (28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens"));
-        choices.insert (p_t (28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"));
-        choices.insert (p_t (28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"));
-        choices.insert (p_t (28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro"));
-        choices.insert (p_t (28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"));
-        choices.insert (p_t (29, "Canon EF 50mm f/1.8 II"));
-        choices.insert (p_t (30, "Canon EF 35-105mm f/4.5-5.6"));
-        choices.insert (p_t (31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens"));
-        choices.insert (p_t (31, "Tamron SP AF 300mm f/2.8 LD IF"));
-        choices.insert (p_t (32, "Canon EF 24mm f/2.8 or Sigma Lens"));
-        choices.insert (p_t (32, "Sigma 15mm f/2.8 EX Fisheye"));
-        choices.insert (p_t (33, "Voigtlander or Carl Zeiss Lens"));
-        choices.insert (p_t (33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"));
-        choices.insert (p_t (33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical"));
-        choices.insert (p_t (33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 15mm f/2.8 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 18mm f/3.5 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 21mm f/2.8 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 25mm f/2 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 28mm f/2 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 35mm f/2 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Distagon T* 35mm f/1.4 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Planar T* 50mm f/1.4 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE"));
-        choices.insert (p_t (33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE"));
-        choices.insert (p_t (35, "Canon EF 35-80mm f/4-5.6"));
-        choices.insert (p_t (36, "Canon EF 38-76mm f/4.5-5.6"));
-        choices.insert (p_t (37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"));
-        choices.insert (p_t (37, "Tamron 70-200mm f/2.8 Di LD IF Macro"));
-        choices.insert (p_t (37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"));
-        choices.insert (p_t (37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"));
-        choices.insert (p_t (37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"));
-        choices.insert (p_t (38, "Canon EF 80-200mm f/4.5-5.6"));
-        choices.insert (p_t (39, "Canon EF 75-300mm f/4-5.6"));
-        choices.insert (p_t (40, "Canon EF 28-80mm f/3.5-5.6"));
-        choices.insert (p_t (41, "Canon EF 28-90mm f/4-5.6"));
-        choices.insert (p_t (42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens"));
-        choices.insert (p_t (42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"));
-        choices.insert (p_t (43, "Canon EF 28-105mm f/4-5.6"));
-        choices.insert (p_t (44, "Canon EF 90-300mm f/4.5-5.6"));
-        choices.insert (p_t (45, "Canon EF-S 18-55mm f/3.5-5.6 [II]"));
-        choices.insert (p_t (46, "Canon EF 28-90mm f/4-5.6"));
-        choices.insert (p_t (47, "Zeiss Milvus 35mm f/2 or 50mm f/2"));
-        choices.insert (p_t (47, "Zeiss Milvus 50mm f/2 Makro"));
-        choices.insert (p_t (48, "Canon EF-S 18-55mm f/3.5-5.6 IS"));
-        choices.insert (p_t (49, "Canon EF-S 55-250mm f/4-5.6 IS"));
-        choices.insert (p_t (50, "Canon EF-S 18-200mm f/3.5-5.6 IS"));
-        choices.insert (p_t (51, "Canon EF-S 18-135mm f/3.5-5.6 IS"));
-        choices.insert (p_t (52, "Canon EF-S 18-55mm f/3.5-5.6 IS II"));
-        choices.insert (p_t (53, "Canon EF-S 18-55mm f/3.5-5.6 III"));
-        choices.insert (p_t (54, "Canon EF-S 55-250mm f/4-5.6 IS II"));
-        choices.insert (p_t (60, "Irix 11mm f/4"));
-        choices.insert (p_t (80, "Canon TS-E 50mm f/2.8L Macro"));
-        choices.insert (p_t (81, "Canon TS-E 90mm f/2.8L Macro"));
-        choices.insert (p_t (82, "Canon TS-E 135mm f/4L Macro"));
-        choices.insert (p_t (94, "Canon TS-E 17mm f/4L"));
-        choices.insert (p_t (95, "Canon TS-E 24mm f/3.5L II"));
-        choices.insert (p_t (124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"));
-        choices.insert (p_t (125, "Canon TS-E 24mm f/3.5L"));
-        choices.insert (p_t (126, "Canon TS-E 45mm f/2.8"));
-        choices.insert (p_t (127, "Canon TS-E 90mm f/2.8"));
-        choices.insert (p_t (129, "Canon EF 300mm f/2.8L"));
-        choices.insert (p_t (130, "Canon EF 50mm f/1.0L"));
-        choices.insert (p_t (131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens"));
-        choices.insert (p_t (131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"));
-        choices.insert (p_t (131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"));
-        choices.insert (p_t (131, "Sigma 17-70mm f/2.8-4.5 DC Macro"));
-        choices.insert (p_t (131, "Sigma APO 50-150mm f/2.8 [II] EX DC HSM"));
-        choices.insert (p_t (131, "Sigma APO 120-300mm f/2.8 EX DG HSM"));
-        choices.insert (p_t (131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"));
-        choices.insert (p_t (131, "Sigma 70-200mm f/2.8 APO EX HSM"));
-        choices.insert (p_t (132, "Canon EF 1200mm f/5.6L"));
-        choices.insert (p_t (134, "Canon EF 600mm f/4L IS"));
-        choices.insert (p_t (135, "Canon EF 200mm f/1.8L"));
-        choices.insert (p_t (136, "Canon EF 300mm f/2.8L"));
-        choices.insert (p_t (137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens"));
-        choices.insert (p_t (137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"));
-        choices.insert (p_t (137, "Sigma 50-200mm f/4-5.6 DC OS HSM"));
-        choices.insert (p_t (137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"));
-        choices.insert (p_t (137, "Sigma 24-70mm f/2.8 IF EX DG HSM"));
-        choices.insert (p_t (137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM"));
-        choices.insert (p_t (137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"));
-        choices.insert (p_t (137, "Sigma 17-50mm f/2.8 OS HSM"));
-        choices.insert (p_t (137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]"));
-        choices.insert (p_t (137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"));
-        choices.insert (p_t (137, "Sigma 8-16mm f/4.5-5.6 DC HSM"));
-        choices.insert (p_t (137, "Tamron SP 17-50mm f/2.8 XR Di II VC"));
-        choices.insert (p_t (137, "Tamron SP 60mm f/2 Macro Di II"));
-        choices.insert (p_t (137, "Sigma 10-20mm f/3.5 EX DC HSM"));
-        choices.insert (p_t (137, "Tamron SP 24-70mm f/2.8 Di VC USD"));
-        choices.insert (p_t (137, "Sigma 18-35mm f/1.8 DC HSM"));
-        choices.insert (p_t (137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"));
-        choices.insert (p_t (138, "Canon EF 28-80mm f/2.8-4L"));
-        choices.insert (p_t (139, "Canon EF 400mm f/2.8L"));
-        choices.insert (p_t (140, "Canon EF 500mm f/4.5L"));
-        choices.insert (p_t (141, "Canon EF 500mm f/4.5L"));
-        choices.insert (p_t (142, "Canon EF 300mm f/2.8L IS"));
-        choices.insert (p_t (143, "Canon EF 500mm f/4L IS or Sigma Lens"));
-        choices.insert (p_t (143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"));
-        choices.insert (p_t (144, "Canon EF 35-135mm f/4-5.6 USM"));
-        choices.insert (p_t (145, "Canon EF 100-300mm f/4.5-5.6 USM"));
-        choices.insert (p_t (146, "Canon EF 70-210mm f/3.5-4.5 USM"));
-        choices.insert (p_t (147, "Canon EF 35-135mm f/4-5.6 USM"));
-        choices.insert (p_t (148, "Canon EF 28-80mm f/3.5-5.6 USM"));
-        choices.insert (p_t (149, "Canon EF 100mm f/2 USM"));
-        choices.insert (p_t (150, "Canon EF 14mm f/2.8L or Sigma Lens"));
-        choices.insert (p_t (150, "Sigma 20mm EX f/1.8"));
-        choices.insert (p_t (150, "Sigma 30mm f/1.4 DC HSM"));
-        choices.insert (p_t (150, "Sigma 24mm f/1.8 DG Macro EX"));
-        choices.insert (p_t (150, "Sigma 28mm f/1.8 DG Macro EX"));
-        choices.insert (p_t (151, "Canon EF 200mm f/2.8L"));
-        choices.insert (p_t (152, "Canon EF 300mm f/4L IS or Sigma Lens"));
-        choices.insert (p_t (152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"));
-        choices.insert (p_t (152, "Sigma 14mm f/2.8 EX Aspherical HSM"));
-        choices.insert (p_t (152, "Sigma 10-20mm f/4-5.6"));
-        choices.insert (p_t (152, "Sigma 100-300mm f/4"));
-        choices.insert (p_t (153, "Canon EF 35-350mm f/3.5-5.6L or Sigma or Tamron Lens"));
-        choices.insert (p_t (153, "Sigma 50-500mm f/4-6.3 APO HSM EX"));
-        choices.insert (p_t (153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"));
-        choices.insert (p_t (153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"));
-        choices.insert (p_t (153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"));
-        choices.insert (p_t (154, "Canon EF 20mm f/2.8 USM or Zeiss Lens"));
-        choices.insert (p_t (154, "Zeiss Milvus 21mm f/2.8"));
-        choices.insert (p_t (155, "Canon EF 85mm f/1.8 USM"));
-        choices.insert (p_t (156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"));
-        choices.insert (p_t (156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD"));
-        choices.insert (p_t (156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"));
-        choices.insert (p_t (160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"));
-        choices.insert (p_t (160, "Tamron AF 19-35mm f/3.5-4.5"));
-        choices.insert (p_t (160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4"));
-        choices.insert (p_t (160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"));
-        choices.insert (p_t (160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"));
-        choices.insert (p_t (160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"));
-        choices.insert (p_t (161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"));
-        choices.insert (p_t (161, "Sigma 24-70mm f/2.8 EX"));
-        choices.insert (p_t (161, "Sigma 28-70mm f/2.8 EX"));
-        choices.insert (p_t (161, "Sigma 24-60mm f/2.8 EX DG"));
-        choices.insert (p_t (161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"));
-        choices.insert (p_t (161, "Tamron 90mm f/2.8"));
-        choices.insert (p_t (161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"));
-        choices.insert (p_t (161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"));
-        choices.insert (p_t (162, "Canon EF 200mm f/2.8L"));
-        choices.insert (p_t (163, "Canon EF 300mm f/4L"));
-        choices.insert (p_t (164, "Canon EF 400mm f/5.6L"));
-        choices.insert (p_t (165, "Canon EF 70-200mm f/2.8 L"));
-        choices.insert (p_t (166, "Canon EF 70-200mm f/2.8 L + 1.4x"));
-        choices.insert (p_t (167, "Canon EF 70-200mm f/2.8 L + 2x"));
-        choices.insert (p_t (168, "Canon EF 28mm f/1.8 USM or Sigma Lens"));
-        choices.insert (p_t (168, "Sigma 50-100mm f/1.8 DC HSM | A"));
-        choices.insert (p_t (169, "Canon EF 17-35mm f/2.8L or Sigma Lens"));
-        choices.insert (p_t (169, "Sigma 18-200mm f/3.5-6.3 DC OS"));
-        choices.insert (p_t (169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"));
-        choices.insert (p_t (169, "Sigma 18-50mm f/2.8 Macro"));
-        choices.insert (p_t (169, "Sigma 50mm f/1.4 EX DG HSM"));
-        choices.insert (p_t (169, "Sigma 85mm f/1.4 EX DG HSM"));
-        choices.insert (p_t (169, "Sigma 30mm f/1.4 EX DC HSM"));
-        choices.insert (p_t (169, "Sigma 35mm f/1.4 DG HSM"));
-        choices.insert (p_t (170, "Canon EF 200mm f/2.8L II"));
-        choices.insert (p_t (171, "Canon EF 300mm f/4L"));
-        choices.insert (p_t (172, "Canon EF 400mm f/5.6L or Sigma Lens"));
-        choices.insert (p_t (172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"));
-        choices.insert (p_t (173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"));
-        choices.insert (p_t (173, "Sigma 180mm EX HSM Macro f/3.5"));
-        choices.insert (p_t (173, "Sigma APO Macro 150mm f/2.8 EX DG HSM"));
-        choices.insert (p_t (174, "Canon EF 135mm f/2L or Other Lens"));
-        choices.insert (p_t (174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"));
-        choices.insert (p_t (174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"));
-        choices.insert (p_t (174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"));
-        choices.insert (p_t (174, "Zeiss Milvus 100mm f/2 Makro"));
-        choices.insert (p_t (175, "Canon EF 400mm f/2.8L"));
-        choices.insert (p_t (176, "Canon EF 24-85mm f/3.5-4.5 USM"));
-        choices.insert (p_t (177, "Canon EF 300mm f/4L IS"));
-        choices.insert (p_t (178, "Canon EF 28-135mm f/3.5-5.6 IS"));
-        choices.insert (p_t (179, "Canon EF 24mm f/1.4L"));
-        choices.insert (p_t (180, "Canon EF 35mm f/1.4L or Other Lens"));
-        choices.insert (p_t (180, "Sigma 50mm f/1.4 DG HSM | A"));
-        choices.insert (p_t (180, "Sigma 24mm f/1.4 DG HSM | A"));
-        choices.insert (p_t (180, "Zeiss Milvus 50mm f/1.4"));
-        choices.insert (p_t (180, "Zeiss Milvus 85mm f/1.4"));
-        choices.insert (p_t (180, "Zeiss Otus 28mm f/1.4 ZE"));
-        choices.insert (p_t (181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens"));
-        choices.insert (p_t (181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"));
-        choices.insert (p_t (182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens"));
-        choices.insert (p_t (182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x"));
-        choices.insert (p_t (183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"));
-        choices.insert (p_t (183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"));
-        choices.insert (p_t (183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"));
-        choices.insert (p_t (183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"));
-        choices.insert (p_t (183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"));
-        choices.insert (p_t (183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"));
-        choices.insert (p_t (183, "Sigma 100-400mm f/5-6.3 DG OS HSM"));
-        choices.insert (p_t (184, "Canon EF 400mm f/2.8L + 2x"));
-        choices.insert (p_t (185, "Canon EF 600mm f/4L IS"));
-        choices.insert (p_t (186, "Canon EF 70-200mm f/4L"));
-        choices.insert (p_t (187, "Canon EF 70-200mm f/4L + 1.4x"));
-        choices.insert (p_t (188, "Canon EF 70-200mm f/4L + 2x"));
-        choices.insert (p_t (189, "Canon EF 70-200mm f/4L + 2.8x"));
-        choices.insert (p_t (190, "Canon EF 100mm f/2.8 Macro USM"));
-        choices.insert (p_t (191, "Canon EF 400mm f/4 DO IS"));
-        choices.insert (p_t (193, "Canon EF 35-80mm f/4-5.6 USM"));
-        choices.insert (p_t (194, "Canon EF 80-200mm f/4.5-5.6 USM"));
-        choices.insert (p_t (195, "Canon EF 35-105mm f/4.5-5.6 USM"));
-        choices.insert (p_t (196, "Canon EF 75-300mm f/4-5.6 USM"));
-        choices.insert (p_t (197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens"));
-        choices.insert (p_t (197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS"));
-        choices.insert (p_t (198, "Canon EF 50mm f/1.4 USM or Zeiss Lens"));
-        choices.insert (p_t (198, "Zeiss Otus 55mm f/1.4 ZE"));
-        choices.insert (p_t (198, "Zeiss Otus 85mm f/1.4 ZE"));
-        choices.insert (p_t (199, "Canon EF 28-80mm f/3.5-5.6 USM"));
-        choices.insert (p_t (200, "Canon EF 75-300mm f/4-5.6 USM"));
-        choices.insert (p_t (201, "Canon EF 28-80mm f/3.5-5.6 USM"));
-        choices.insert (p_t (202, "Canon EF 28-80mm f/3.5-5.6 USM IV"));
-        choices.insert (p_t (208, "Canon EF 22-55mm f/4-5.6 USM"));
-        choices.insert (p_t (209, "Canon EF 55-200mm f/4.5-5.6"));
-        choices.insert (p_t (210, "Canon EF 28-90mm f/4-5.6 USM"));
-        choices.insert (p_t (211, "Canon EF 28-200mm f/3.5-5.6 USM"));
-        choices.insert (p_t (212, "Canon EF 28-105mm f/4-5.6 USM"));
-        choices.insert (p_t (213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens"));
-        choices.insert (p_t (213, "Tamron SP 150-600mm f/5-6.3 Di VC USD"));
-        choices.insert (p_t (213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro"));
-        choices.insert (p_t (213, "Tamron SP 35mm f/1.8 Di VC USD"));
-        choices.insert (p_t (213, "Tamron SP 45mm f/1.8 Di VC USD"));
-        choices.insert (p_t (214, "Canon EF-S 18-55mm f/3.5-5.6 USM"));
-        choices.insert (p_t (215, "Canon EF 55-200mm f/4.5-5.6 II USM"));
-        choices.insert (p_t (217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"));
-        choices.insert (p_t (224, "Canon EF 70-200mm f/2.8L IS"));
-        choices.insert (p_t (225, "Canon EF 70-200mm f/2.8L IS + 1.4x"));
-        choices.insert (p_t (226, "Canon EF 70-200mm f/2.8L IS + 2x"));
-        choices.insert (p_t (227, "Canon EF 70-200mm f/2.8L IS + 2.8x"));
-        choices.insert (p_t (228, "Canon EF 28-105mm f/3.5-4.5 USM"));
-        choices.insert (p_t (229, "Canon EF 16-35mm f/2.8L"));
-        choices.insert (p_t (230, "Canon EF 24-70mm f/2.8L"));
-        choices.insert (p_t (231, "Canon EF 17-40mm f/4L"));
-        choices.insert (p_t (232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"));
-        choices.insert (p_t (233, "Canon EF 28-300mm f/3.5-5.6L IS"));
-        choices.insert (p_t (234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens"));
-        choices.insert (p_t (234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"));
-        choices.insert (p_t (235, "Canon EF-S 10-22mm f/3.5-4.5 USM"));
-        choices.insert (p_t (236, "Canon EF-S 60mm f/2.8 Macro USM"));
-        choices.insert (p_t (237, "Canon EF 24-105mm f/4L IS"));
-        choices.insert (p_t (238, "Canon EF 70-300mm f/4-5.6 IS USM"));
-        choices.insert (p_t (239, "Canon EF 85mm f/1.2L II"));
-        choices.insert (p_t (240, "Canon EF-S 17-55mm f/2.8 IS USM"));
-        choices.insert (p_t (241, "Canon EF 50mm f/1.2L"));
-        choices.insert (p_t (242, "Canon EF 70-200mm f/4L IS"));
-        choices.insert (p_t (243, "Canon EF 70-200mm f/4L IS + 1.4x"));
-        choices.insert (p_t (244, "Canon EF 70-200mm f/4L IS + 2x"));
-        choices.insert (p_t (245, "Canon EF 70-200mm f/4L IS + 2.8x"));
-        choices.insert (p_t (246, "Canon EF 16-35mm f/2.8L II"));
-        choices.insert (p_t (247, "Canon EF 14mm f/2.8L II USM"));
-        choices.insert (p_t (248, "Canon EF 200mm f/2L IS or Sigma Lens"));
-        choices.insert (p_t (248, "Sigma 24-35mm f/2 DG HSM | A"));
-        choices.insert (p_t (249, "Canon EF 800mm f/5.6L IS"));
-        choices.insert (p_t (250, "Canon EF 24mm f/1.4L II or Sigma Lens"));
-        choices.insert (p_t (250, "Sigma 20mm f/1.4 DG HSM | A"));
-        choices.insert (p_t (251, "Canon EF 70-200mm f/2.8L IS II USM"));
-        choices.insert (p_t (252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"));
-        choices.insert (p_t (253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"));
-        choices.insert (p_t (254, "Canon EF 100mm f/2.8L Macro IS USM"));
-        choices.insert (p_t (255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens"));
-        choices.insert (p_t (255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"));
-        choices.insert (p_t (488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"));
-        choices.insert (p_t (489, "Canon EF 70-300mm f/4-5.6L IS USM"));
-        choices.insert (p_t (490, "Canon EF 8-15mm f/4L Fisheye USM"));
-        choices.insert (p_t (491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens"));
-        choices.insert (p_t (491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"));
-        choices.insert (p_t (491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"));
-        choices.insert (p_t (492, "Canon EF 400mm f/2.8L IS II USM"));
-        choices.insert (p_t (493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"));
-        choices.insert (p_t (493, "Canon EF 24-105mm f/4L IS USM"));
-        choices.insert (p_t (494, "Canon EF 600mm f/4.0L IS II USM"));
-        choices.insert (p_t (495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens"));
-        choices.insert (p_t (495, "Sigma 24-70mm F2.8 DG OS HSM | A"));
-        choices.insert (p_t (496, "Canon EF 200-400mm f/4L IS USM"));
-        choices.insert (p_t (499, "Canon EF 200-400mm f/4L IS USM + 1.4x"));
-        choices.insert (p_t (502, "Canon EF 28mm f/2.8 IS USM"));
-        choices.insert (p_t (503, "Canon EF 24mm f/2.8 IS USM"));
-        choices.insert (p_t (504, "Canon EF 24-70mm f/4L IS USM"));
-        choices.insert (p_t (505, "Canon EF 35mm f/2 IS USM"));
-        choices.insert (p_t (506, "Canon EF 400mm f/4 DO IS II USM"));
-        choices.insert (p_t (507, "Canon EF 16-35mm f/4L IS USM"));
-        choices.insert (p_t (508, "Canon EF 11-24mm f/4L USM or Tamron Lens"));
-        choices.insert (p_t (508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"));
-        choices.insert (p_t (747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"));
-        choices.insert (p_t (747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2"));
-        choices.insert (p_t (748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"));
-        choices.insert (p_t (750, "Canon EF 35mm f/1.4L II USM"));
-        choices.insert (p_t (751, "Canon EF 16-35mm f/2.8L III USM"));
-        choices.insert (p_t (752, "Canon EF 24-105mm f/4L IS II USM"));
-        choices.insert (p_t (4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"));
-        choices.insert (p_t (4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"));
-        choices.insert (p_t (4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
-        choices.insert (p_t (4144, "Canon EF 40mm f/2.8 STM"));
-        choices.insert (p_t (4145, "Canon EF-M 22mm f/2 STM"));
-        choices.insert (p_t (4146, "Canon EF-S 18-55mm f/3.5-5.6 IS STM"));
-        choices.insert (p_t (4147, "Canon EF-M 11-22mm f/4-5.6 IS STM"));
-        choices.insert (p_t (4148, "Canon EF-S 55-250mm f/4-5.6 IS STM"));
-        choices.insert (p_t (4149, "Canon EF-M 55-200mm f/4.5-6.3 IS STM"));
-        choices.insert (p_t (4150, "Canon EF-S 10-18mm f/4.5-5.6 IS STM"));
-        choices.insert (p_t (4152, "Canon EF 24-105mm f/3.5-5.6 IS STM"));
-        choices.insert (p_t (4153, "Canon EF-M 15-45mm f/3.5-6.3 IS STM"));
-        choices.insert (p_t (4154, "Canon EF-S 24mm f/2.8 STM"));
-        choices.insert (p_t (4155, "Canon EF-M 28mm f/3.5 Macro IS STM"));
-        choices.insert (p_t (4156, "Canon EF 50mm f/1.8 STM"));
-        choices.insert (p_t (4157, "Canon EF-M 18-150mm 1:3.5-6.3 IS STM"));
-        choices.insert (p_t (4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"));
-        choices.insert (p_t (4160, "Canon EF-S 35mm f/2.8 Macro IS STM"));
-        choices.insert (p_t (36910, "Canon EF 70-300mm f/4-5.6 IS II USM"));
-        choices.insert (p_t (36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"));
-        choices.insert (p_t (61491, "Canon CN-E 14mm T3.1 L F"));
-        choices.insert (p_t (61492, "Canon CN-E 24mm T1.5 L F"));
-        choices.insert (p_t (61494, "Canon CN-E 85mm T1.3 L F"));
-        choices.insert (p_t (61495, "Canon CN-E 135mm T2.2 L F"));
-        choices.insert (p_t (61496, "Canon CN-E 35mm T1.5 L F"));
-        choices.insert (p_t (65535, "n/a"));
+        choices = {
+            {1, "Canon EF 50mm f/1.8"},
+            {2, "Canon EF 28mm f/2.8"},
+            {3, "Canon EF 135mm f/2.8 Soft"},
+            {4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens"},
+            {4, "Sigma UC Zoom 35-135mm f/4-5.6"},
+            {5, "Canon EF 35-70mm f/3.5-4.5"},
+            {6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens"},
+            {6, "Sigma 18-50mm f/3.5-5.6 DC"},
+            {6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP"},
+            {6, "Tokina AF 193-2 19-35mm f/3.5-4.5"},
+            {6, "Sigma 28-80mm f/3.5-5.6 II Macro"},
+            {7, "Canon EF 100-300mm f/5.6L"},
+            {8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens"},
+            {8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro"},
+            {8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"},
+            {9, "Canon EF 70-210mm f/4"},
+            {9, "Sigma 55-200mm f/4-5.6 DC"},
+            {10, "Canon EF 50mm f/2.5 Macro or Sigma Lens"},
+            {10, "Sigma 50mm f/2.8 EX"},
+            {10, "Sigma 28mm f/1.8"},
+            {10, "Sigma 105mm f/2.8 Macro EX"},
+            {10, "Sigma 70mm f/2.8 EX DG Macro EF"},
+            {11, "Canon EF 35mm f/2"},
+            {13, "Canon EF 15mm f/2.8 Fisheye"},
+            {14, "Canon EF 50-200mm f/3.5-4.5L"},
+            {15, "Canon EF 50-200mm f/3.5-4.5"},
+            {16, "Canon EF 35-135mm f/3.5-4.5"},
+            {17, "Canon EF 35-70mm f/3.5-4.5A"},
+            {18, "Canon EF 28-70mm f/3.5-4.5"},
+            {20, "Canon EF 100-200mm f/4.5A"},
+            {21, "Canon EF 80-200mm f/2.8L"},
+            {22, "Canon EF 20-35mm f/2.8L or Tokina Lens"},
+            {22, "Tokina AT-X 280 AF Pro 28-80mm f/2.8 Aspherical"},
+            {23, "Canon EF 35-105mm f/3.5-4.5"},
+            {24, "Canon EF 35-80mm f/4-5.6 Power Zoom"},
+            {25, "Canon EF 35-80mm f/4-5.6 Power Zoom"},
+            {26, "Canon EF 100mm f/2.8 Macro or Other Lens"},
+            {26, "Cosina 100mm f/3.5 Macro AF"},
+            {26, "Tamron SP AF 90mm f/2.8 Di Macro"},
+            {26, "Tamron SP AF 180mm f/3.5 Di Macro"},
+            {26, "Carl Zeiss Planar T* 50mm f/1.4"},
+            {27, "Canon EF 35-80mm f/4-5.6"},
+            {28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens"},
+            {28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
+            {28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
+            {28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro"},
+            {28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"},
+            {29, "Canon EF 50mm f/1.8 II"},
+            {30, "Canon EF 35-105mm f/4.5-5.6"},
+            {31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens"},
+            {31, "Tamron SP AF 300mm f/2.8 LD IF"},
+            {32, "Canon EF 24mm f/2.8 or Sigma Lens"},
+            {32, "Sigma 15mm f/2.8 EX Fisheye"},
+            {33, "Voigtlander or Carl Zeiss Lens"},
+            {33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"},
+            {33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical"},
+            {33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus"},
+            {33, "Carl Zeiss Distagon T* 15mm f/2.8 ZE"},
+            {33, "Carl Zeiss Distagon T* 18mm f/3.5 ZE"},
+            {33, "Carl Zeiss Distagon T* 21mm f/2.8 ZE"},
+            {33, "Carl Zeiss Distagon T* 25mm f/2 ZE"},
+            {33, "Carl Zeiss Distagon T* 28mm f/2 ZE"},
+            {33, "Carl Zeiss Distagon T* 35mm f/2 ZE"},
+            {33, "Carl Zeiss Distagon T* 35mm f/1.4 ZE"},
+            {33, "Carl Zeiss Planar T* 50mm f/1.4 ZE"},
+            {33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE"},
+            {33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE"},
+            {33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE"},
+            {35, "Canon EF 35-80mm f/4-5.6"},
+            {36, "Canon EF 38-76mm f/4.5-5.6"},
+            {37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"},
+            {37, "Tamron 70-200mm f/2.8 Di LD IF Macro"},
+            {37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"},
+            {37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"},
+            {37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
+            {38, "Canon EF 80-200mm f/4.5-5.6"},
+            {39, "Canon EF 75-300mm f/4-5.6"},
+            {40, "Canon EF 28-80mm f/3.5-5.6"},
+            {41, "Canon EF 28-90mm f/4-5.6"},
+            {42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens"},
+            {42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"},
+            {43, "Canon EF 28-105mm f/4-5.6"},
+            {44, "Canon EF 90-300mm f/4.5-5.6"},
+            {45, "Canon EF-S 18-55mm f/3.5-5.6 [II]"},
+            {46, "Canon EF 28-90mm f/4-5.6"},
+            {47, "Zeiss Milvus 35mm f/2 or 50mm f/2"},
+            {47, "Zeiss Milvus 50mm f/2 Makro"},
+            {48, "Canon EF-S 18-55mm f/3.5-5.6 IS"},
+            {49, "Canon EF-S 55-250mm f/4-5.6 IS"},
+            {50, "Canon EF-S 18-200mm f/3.5-5.6 IS"},
+            {51, "Canon EF-S 18-135mm f/3.5-5.6 IS"},
+            {52, "Canon EF-S 18-55mm f/3.5-5.6 IS II"},
+            {53, "Canon EF-S 18-55mm f/3.5-5.6 III"},
+            {54, "Canon EF-S 55-250mm f/4-5.6 IS II"},
+            {60, "Irix 11mm f/4"},
+            {80, "Canon TS-E 50mm f/2.8L Macro"},
+            {81, "Canon TS-E 90mm f/2.8L Macro"},
+            {82, "Canon TS-E 135mm f/4L Macro"},
+            {94, "Canon TS-E 17mm f/4L"},
+            {95, "Canon TS-E 24mm f/3.5L II"},
+            {124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"},
+            {125, "Canon TS-E 24mm f/3.5L"},
+            {126, "Canon TS-E 45mm f/2.8"},
+            {127, "Canon TS-E 90mm f/2.8"},
+            {129, "Canon EF 300mm f/2.8L"},
+            {130, "Canon EF 50mm f/1.0L"},
+            {131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens"},
+            {131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"},
+            {131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"},
+            {131, "Sigma 17-70mm f/2.8-4.5 DC Macro"},
+            {131, "Sigma APO 50-150mm f/2.8 [II] EX DC HSM"},
+            {131, "Sigma APO 120-300mm f/2.8 EX DG HSM"},
+            {131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"},
+            {131, "Sigma 70-200mm f/2.8 APO EX HSM"},
+            {132, "Canon EF 1200mm f/5.6L"},
+            {134, "Canon EF 600mm f/4L IS"},
+            {135, "Canon EF 200mm f/1.8L"},
+            {136, "Canon EF 300mm f/2.8L"},
+            {137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens"},
+            {137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"},
+            {137, "Sigma 50-200mm f/4-5.6 DC OS HSM"},
+            {137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"},
+            {137, "Sigma 24-70mm f/2.8 IF EX DG HSM"},
+            {137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM"},
+            {137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"},
+            {137, "Sigma 17-50mm f/2.8 OS HSM"},
+            {137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]"},
+            {137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"},
+            {137, "Sigma 8-16mm f/4.5-5.6 DC HSM"},
+            {137, "Tamron SP 17-50mm f/2.8 XR Di II VC"},
+            {137, "Tamron SP 60mm f/2 Macro Di II"},
+            {137, "Sigma 10-20mm f/3.5 EX DC HSM"},
+            {137, "Tamron SP 24-70mm f/2.8 Di VC USD"},
+            {137, "Sigma 18-35mm f/1.8 DC HSM"},
+            {137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"},
+            {138, "Canon EF 28-80mm f/2.8-4L"},
+            {139, "Canon EF 400mm f/2.8L"},
+            {140, "Canon EF 500mm f/4.5L"},
+            {141, "Canon EF 500mm f/4.5L"},
+            {142, "Canon EF 300mm f/2.8L IS"},
+            {143, "Canon EF 500mm f/4L IS or Sigma Lens"},
+            {143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"},
+            {144, "Canon EF 35-135mm f/4-5.6 USM"},
+            {145, "Canon EF 100-300mm f/4.5-5.6 USM"},
+            {146, "Canon EF 70-210mm f/3.5-4.5 USM"},
+            {147, "Canon EF 35-135mm f/4-5.6 USM"},
+            {148, "Canon EF 28-80mm f/3.5-5.6 USM"},
+            {149, "Canon EF 100mm f/2 USM"},
+            {150, "Canon EF 14mm f/2.8L or Sigma Lens"},
+            {150, "Sigma 20mm EX f/1.8"},
+            {150, "Sigma 30mm f/1.4 DC HSM"},
+            {150, "Sigma 24mm f/1.8 DG Macro EX"},
+            {150, "Sigma 28mm f/1.8 DG Macro EX"},
+            {151, "Canon EF 200mm f/2.8L"},
+            {152, "Canon EF 300mm f/4L IS or Sigma Lens"},
+            {152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"},
+            {152, "Sigma 14mm f/2.8 EX Aspherical HSM"},
+            {152, "Sigma 10-20mm f/4-5.6"},
+            {152, "Sigma 100-300mm f/4"},
+            {153, "Canon EF 35-350mm f/3.5-5.6L or Sigma or Tamron Lens"},
+            {153, "Sigma 50-500mm f/4-6.3 APO HSM EX"},
+            {153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"},
+            {153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"},
+            {153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"},
+            {154, "Canon EF 20mm f/2.8 USM or Zeiss Lens"},
+            {154, "Zeiss Milvus 21mm f/2.8"},
+            {155, "Canon EF 85mm f/1.8 USM"},
+            {156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"},
+            {156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD"},
+            {156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
+            {160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"},
+            {160, "Tamron AF 19-35mm f/3.5-4.5"},
+            {160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4"},
+            {160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"},
+            {160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"},
+            {160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"},
+            {161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"},
+            {161, "Sigma 24-70mm f/2.8 EX"},
+            {161, "Sigma 28-70mm f/2.8 EX"},
+            {161, "Sigma 24-60mm f/2.8 EX DG"},
+            {161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"},
+            {161, "Tamron 90mm f/2.8"},
+            {161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
+            {161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
+            {162, "Canon EF 200mm f/2.8L"},
+            {163, "Canon EF 300mm f/4L"},
+            {164, "Canon EF 400mm f/5.6L"},
+            {165, "Canon EF 70-200mm f/2.8 L"},
+            {166, "Canon EF 70-200mm f/2.8 L + 1.4x"},
+            {167, "Canon EF 70-200mm f/2.8 L + 2x"},
+            {168, "Canon EF 28mm f/1.8 USM or Sigma Lens"},
+            {168, "Sigma 50-100mm f/1.8 DC HSM | A"},
+            {169, "Canon EF 17-35mm f/2.8L or Sigma Lens"},
+            {169, "Sigma 18-200mm f/3.5-6.3 DC OS"},
+            {169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"},
+            {169, "Sigma 18-50mm f/2.8 Macro"},
+            {169, "Sigma 50mm f/1.4 EX DG HSM"},
+            {169, "Sigma 85mm f/1.4 EX DG HSM"},
+            {169, "Sigma 30mm f/1.4 EX DC HSM"},
+            {169, "Sigma 35mm f/1.4 DG HSM"},
+            {170, "Canon EF 200mm f/2.8L II"},
+            {171, "Canon EF 300mm f/4L"},
+            {172, "Canon EF 400mm f/5.6L or Sigma Lens"},
+            {172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
+            {173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"},
+            {173, "Sigma 180mm EX HSM Macro f/3.5"},
+            {173, "Sigma APO Macro 150mm f/2.8 EX DG HSM"},
+            {174, "Canon EF 135mm f/2L or Other Lens"},
+            {174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"},
+            {174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"},
+            {174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"},
+            {174, "Zeiss Milvus 100mm f/2 Makro"},
+            {175, "Canon EF 400mm f/2.8L"},
+            {176, "Canon EF 24-85mm f/3.5-4.5 USM"},
+            {177, "Canon EF 300mm f/4L IS"},
+            {178, "Canon EF 28-135mm f/3.5-5.6 IS"},
+            {179, "Canon EF 24mm f/1.4L"},
+            {180, "Canon EF 35mm f/1.4L or Other Lens"},
+            {180, "Sigma 50mm f/1.4 DG HSM | A"},
+            {180, "Sigma 24mm f/1.4 DG HSM | A"},
+            {180, "Zeiss Milvus 50mm f/1.4"},
+            {180, "Zeiss Milvus 85mm f/1.4"},
+            {180, "Zeiss Otus 28mm f/1.4 ZE"},
+            {181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens"},
+            {181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"},
+            {182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens"},
+            {182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x"},
+            {183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"},
+            {183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"},
+            {183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"},
+            {183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
+            {183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
+            {183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
+            {183, "Sigma 100-400mm f/5-6.3 DG OS HSM"},
+            {184, "Canon EF 400mm f/2.8L + 2x"},
+            {185, "Canon EF 600mm f/4L IS"},
+            {186, "Canon EF 70-200mm f/4L"},
+            {187, "Canon EF 70-200mm f/4L + 1.4x"},
+            {188, "Canon EF 70-200mm f/4L + 2x"},
+            {189, "Canon EF 70-200mm f/4L + 2.8x"},
+            {190, "Canon EF 100mm f/2.8 Macro USM"},
+            {191, "Canon EF 400mm f/4 DO IS"},
+            {193, "Canon EF 35-80mm f/4-5.6 USM"},
+            {194, "Canon EF 80-200mm f/4.5-5.6 USM"},
+            {195, "Canon EF 35-105mm f/4.5-5.6 USM"},
+            {196, "Canon EF 75-300mm f/4-5.6 USM"},
+            {197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens"},
+            {197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS"},
+            {198, "Canon EF 50mm f/1.4 USM or Zeiss Lens"},
+            {198, "Zeiss Otus 55mm f/1.4 ZE"},
+            {198, "Zeiss Otus 85mm f/1.4 ZE"},
+            {199, "Canon EF 28-80mm f/3.5-5.6 USM"},
+            {200, "Canon EF 75-300mm f/4-5.6 USM"},
+            {201, "Canon EF 28-80mm f/3.5-5.6 USM"},
+            {202, "Canon EF 28-80mm f/3.5-5.6 USM IV"},
+            {208, "Canon EF 22-55mm f/4-5.6 USM"},
+            {209, "Canon EF 55-200mm f/4.5-5.6"},
+            {210, "Canon EF 28-90mm f/4-5.6 USM"},
+            {211, "Canon EF 28-200mm f/3.5-5.6 USM"},
+            {212, "Canon EF 28-105mm f/4-5.6 USM"},
+            {213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens"},
+            {213, "Tamron SP 150-600mm f/5-6.3 Di VC USD"},
+            {213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro"},
+            {213, "Tamron SP 35mm f/1.8 Di VC USD"},
+            {213, "Tamron SP 45mm f/1.8 Di VC USD"},
+            {214, "Canon EF-S 18-55mm f/3.5-5.6 USM"},
+            {215, "Canon EF 55-200mm f/4.5-5.6 II USM"},
+            {217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"},
+            {224, "Canon EF 70-200mm f/2.8L IS"},
+            {225, "Canon EF 70-200mm f/2.8L IS + 1.4x"},
+            {226, "Canon EF 70-200mm f/2.8L IS + 2x"},
+            {227, "Canon EF 70-200mm f/2.8L IS + 2.8x"},
+            {228, "Canon EF 28-105mm f/3.5-4.5 USM"},
+            {229, "Canon EF 16-35mm f/2.8L"},
+            {230, "Canon EF 24-70mm f/2.8L"},
+            {231, "Canon EF 17-40mm f/4L"},
+            {232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"},
+            {233, "Canon EF 28-300mm f/3.5-5.6L IS"},
+            {234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens"},
+            {234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"},
+            {235, "Canon EF-S 10-22mm f/3.5-4.5 USM"},
+            {236, "Canon EF-S 60mm f/2.8 Macro USM"},
+            {237, "Canon EF 24-105mm f/4L IS"},
+            {238, "Canon EF 70-300mm f/4-5.6 IS USM"},
+            {239, "Canon EF 85mm f/1.2L II"},
+            {240, "Canon EF-S 17-55mm f/2.8 IS USM"},
+            {241, "Canon EF 50mm f/1.2L"},
+            {242, "Canon EF 70-200mm f/4L IS"},
+            {243, "Canon EF 70-200mm f/4L IS + 1.4x"},
+            {244, "Canon EF 70-200mm f/4L IS + 2x"},
+            {245, "Canon EF 70-200mm f/4L IS + 2.8x"},
+            {246, "Canon EF 16-35mm f/2.8L II"},
+            {247, "Canon EF 14mm f/2.8L II USM"},
+            {248, "Canon EF 200mm f/2L IS or Sigma Lens"},
+            {248, "Sigma 24-35mm f/2 DG HSM | A"},
+            {249, "Canon EF 800mm f/5.6L IS"},
+            {250, "Canon EF 24mm f/1.4L II or Sigma Lens"},
+            {250, "Sigma 20mm f/1.4 DG HSM | A"},
+            {251, "Canon EF 70-200mm f/2.8L IS II USM"},
+            {252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"},
+            {253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"},
+            {254, "Canon EF 100mm f/2.8L Macro IS USM"},
+            {255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens"},
+            {255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
+            {488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"},
+            {489, "Canon EF 70-300mm f/4-5.6L IS USM"},
+            {490, "Canon EF 8-15mm f/4L Fisheye USM"},
+            {491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens"},
+            {491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
+            {491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
+            {492, "Canon EF 400mm f/2.8L IS II USM"},
+            {493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"},
+            {493, "Canon EF 24-105mm f/4L IS USM"},
+            {494, "Canon EF 600mm f/4.0L IS II USM"},
+            {495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens"},
+            {495, "Sigma 24-70mm F2.8 DG OS HSM | A"},
+            {496, "Canon EF 200-400mm f/4L IS USM"},
+            {499, "Canon EF 200-400mm f/4L IS USM + 1.4x"},
+            {502, "Canon EF 28mm f/2.8 IS USM"},
+            {503, "Canon EF 24mm f/2.8 IS USM"},
+            {504, "Canon EF 24-70mm f/4L IS USM"},
+            {505, "Canon EF 35mm f/2 IS USM"},
+            {506, "Canon EF 400mm f/4 DO IS II USM"},
+            {507, "Canon EF 16-35mm f/4L IS USM"},
+            {508, "Canon EF 11-24mm f/4L USM or Tamron Lens"},
+            {508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"},
+            {747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"},
+            {747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2"},
+            {748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"},
+            {750, "Canon EF 35mm f/1.4L II USM"},
+            {751, "Canon EF 16-35mm f/2.8L III USM"},
+            {752, "Canon EF 24-105mm f/4L IS II USM"},
+            {4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"},
+            {4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"},
+            {4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
+            {4144, "Canon EF 40mm f/2.8 STM"},
+            {4145, "Canon EF-M 22mm f/2 STM"},
+            {4146, "Canon EF-S 18-55mm f/3.5-5.6 IS STM"},
+            {4147, "Canon EF-M 11-22mm f/4-5.6 IS STM"},
+            {4148, "Canon EF-S 55-250mm f/4-5.6 IS STM"},
+            {4149, "Canon EF-M 55-200mm f/4.5-6.3 IS STM"},
+            {4150, "Canon EF-S 10-18mm f/4.5-5.6 IS STM"},
+            {4152, "Canon EF 24-105mm f/3.5-5.6 IS STM"},
+            {4153, "Canon EF-M 15-45mm f/3.5-6.3 IS STM"},
+            {4154, "Canon EF-S 24mm f/2.8 STM"},
+            {4155, "Canon EF-M 28mm f/3.5 Macro IS STM"},
+            {4156, "Canon EF 50mm f/1.8 STM"},
+            {4157, "Canon EF-M 18-150mm 1:3.5-6.3 IS STM"},
+            {4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"},
+            {4160, "Canon EF-S 35mm f/2.8 Macro IS STM"},
+            {36910, "Canon EF 70-300mm f/4-5.6 IS II USM"},
+            {36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"},
+            {61491, "Canon CN-E 14mm T3.1 L F"},
+            {61492, "Canon CN-E 24mm T1.5 L F"},
+            {61494, "Canon CN-E 85mm T1.3 L F"},
+            {61495, "Canon CN-E 135mm T2.2 L F"},
+            {61496, "Canon CN-E 35mm T1.5 L F"},
+            {65535, "n/a"}
+        };
     }
 
     virtual std::string toString (Tag* t)
diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc
index 8b57fd239..a5d10f762 100644
--- a/rtexif/rtexif.cc
+++ b/rtexif/rtexif.cc
@@ -1671,7 +1671,7 @@ void Tag::toString (char* buffer, int ofs)
 
     strcpy (buffer, "");
 
-    for (size_t i = 0; i < std::min<int>(maxcount, valuesize - ofs); i++) {
+    for (ssize_t i = 0; i < std::min<int>(maxcount, valuesize - ofs); i++) {
         if (i > 0) {
             strcat (buffer, ", ");
         }
diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc
index 7d71da9a9..c6c098883 100644
--- a/rtgui/chmixer.cc
+++ b/rtgui/chmixer.cc
@@ -22,7 +22,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"))
+ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), false, true)
 {
 
     imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-RR.png"));
@@ -99,12 +99,16 @@ void ChMixer::read (const ProcParams* pp, const ParamsEdited* pedited)
 
     disableListener ();
 
-    if (pedited)
+    setEnabled(pp->chmixer.enabled);
+    
+    if (pedited) {
         for (int i = 0; i < 3; i++) {
             red[i]->setEditedState (pedited->chmixer.red[i] ? Edited : UnEdited);
             green[i]->setEditedState (pedited->chmixer.green[i] ? Edited : UnEdited);
             blue[i]->setEditedState (pedited->chmixer.blue[i] ? Edited : UnEdited);
         }
+        set_inconsistent(multiImage && !pedited->chmixer.enabled);
+    }
 
     for (int i = 0; i < 3; i++) {
         red[i]->setValue (pp->chmixer.red[i]);
@@ -123,13 +127,16 @@ void ChMixer::write (ProcParams* pp, ParamsEdited* pedited)
         pp->chmixer.green[i] = (int) green[i]->getValue ();
         pp->chmixer.blue[i] = (int) blue[i]->getValue ();
     }
+    pp->chmixer.enabled = getEnabled();
 
-    if (pedited)
+    if (pedited) {
         for (int i = 0; i < 3; i++) {
             pedited->chmixer.red[i] = red[i]->getEditedState ();
             pedited->chmixer.green[i] = green[i]->getEditedState ();
             pedited->chmixer.blue[i] = blue[i]->getEditedState ();
         }
+        pedited->chmixer.enabled = !get_inconsistent();
+    }
 }
 
 void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited)
@@ -158,7 +165,7 @@ void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi
 void ChMixer::adjusterChanged (Adjuster* a, double newval)
 {
 
-    if (listener) {
+    if (listener && getEnabled()) {
         Glib::ustring descr = Glib::ustring::compose ("R=%1,%2,%3\nG=%4,%5,%6\nB=%7,%8,%9",
                               (int)red[0]->getValue(), (int)red[1]->getValue(), (int)red[2]->getValue(),
                               (int)green[0]->getValue(), (int)green[1]->getValue(), (int)green[2]->getValue(),
@@ -167,6 +174,21 @@ void ChMixer::adjusterChanged (Adjuster* a, double newval)
     }
 }
 
+
+void ChMixer::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged(EvChMixer, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged(EvChMixer, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged(EvChMixer, M("GENERAL_DISABLED"));
+        }
+    }
+}
+
+
 void ChMixer::setBatchMode (bool batchMode)
 {
 
diff --git a/rtgui/chmixer.h b/rtgui/chmixer.h
index bd85517de..410ac0d16 100644
--- a/rtgui/chmixer.h
+++ b/rtgui/chmixer.h
@@ -44,6 +44,7 @@ public:
     void adjusterChanged (Adjuster* a, double newval);
     void setAdjusterBehavior (bool rgbadd);
     void trimValues          (rtengine::procparams::ProcParams* pp);
+    void enabledChanged();
 };
 
 #endif
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 7a31ae39f..c9fb1baa3 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -21,7 +21,7 @@
 #include "guiutils.h"
 #include "../rtengine/color.h"
 
-#define MINTEMP0 1500   //1200
+#define MINTEMP0 2000   //1200
 #define MAXTEMP0 12000  //12000
 #define CENTERTEMP0 5000
 #define MINGREEN0 0.8
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index da2659a4f..168106804 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -46,11 +46,7 @@ ExifPanel::ExifPanel () : idata (nullptr)
     exifTreeModel = Gtk::TreeStore::create (exifColumns);
     exifTree->set_model (exifTreeModel);
     exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE);
-    exifTree->set_row_separator_func (
-    [&] (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator & row) {
-        return row->get_value (exifColumns.isSeparator);
-    }
-    );
+    exifTree->set_row_separator_func (sigc::mem_fun(*this, &ExifPanel::rowSeperatorFunc));
 
     delicon = RTImage::createFromFile ("gtk-close.png");
     keepicon = RTImage::createFromFile ("gtk-apply.png");
@@ -540,6 +536,11 @@ void ExifPanel::showAlltoggled ()
     setImageData (idata);
 }
 
+bool ExifPanel::rowSeperatorFunc(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter)
+{
+    return iter->get_value(exifColumns.isSeparator);
+}
+
 void ExifPanel::editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib::ustring value)
 {
 
diff --git a/rtgui/exifpanel.h b/rtgui/exifpanel.h
index b9d76f25d..5121eff4f 100644
--- a/rtgui/exifpanel.h
+++ b/rtgui/exifpanel.h
@@ -93,6 +93,7 @@ private:
     void resetAllPressed();
     void addPressed();
     void showAlltoggled();
+    bool rowSeperatorFunc(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
 
 public:
     ExifPanel ();
diff --git a/rtgui/hsvequalizer.cc b/rtgui/hsvequalizer.cc
index e74848cf3..1dfb017a7 100644
--- a/rtgui/hsvequalizer.cc
+++ b/rtgui/hsvequalizer.cc
@@ -25,7 +25,7 @@ using namespace rtengine::procparams;
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-HSVEqualizer::HSVEqualizer () : FoldableToolPanel(this, "hsvequalizer", M("TP_HSVEQUALIZER_LABEL"))
+HSVEqualizer::HSVEqualizer () : FoldableToolPanel(this, "hsvequalizer", M("TP_HSVEQUALIZER_LABEL"), false, true)
 {
 
     std::vector<GradientMilestone> bottomMilestones;
@@ -84,11 +84,13 @@ void HSVEqualizer::read (const ProcParams* pp, const ParamsEdited* pedited)
         hshape->setUnChanged (!pedited->hsvequalizer.hcurve);
         sshape->setUnChanged (!pedited->hsvequalizer.scurve);
         vshape->setUnChanged (!pedited->hsvequalizer.vcurve);
+        set_inconsistent(multiImage && !pedited->hsvequalizer.enabled);
     }
 
     hshape->setCurve         (pp->hsvequalizer.hcurve);
     sshape->setCurve         (pp->hsvequalizer.scurve);
     vshape->setCurve         (pp->hsvequalizer.vcurve);
+    setEnabled(pp->hsvequalizer.enabled);
 
     enableListener ();
 }
@@ -116,7 +118,7 @@ void HSVEqualizer::autoOpenCurve ()
 
 void HSVEqualizer::write (ProcParams* pp, ParamsEdited* pedited)
 {
-
+    pp->hsvequalizer.enabled = getEnabled();
     pp->hsvequalizer.hcurve = hshape->getCurve ();
     pp->hsvequalizer.scurve = sshape->getCurve ();
     pp->hsvequalizer.vcurve = vshape->getCurve ();
@@ -126,6 +128,7 @@ void HSVEqualizer::write (ProcParams* pp, ParamsEdited* pedited)
         pedited->hsvequalizer.hcurve = !hshape->isUnChanged ();
         pedited->hsvequalizer.scurve = !sshape->isUnChanged ();
         pedited->hsvequalizer.vcurve = !vshape->isUnChanged ();
+        pedited->hsvequalizer.enabled = !get_inconsistent();
     }
 }
 
@@ -138,7 +141,7 @@ void HSVEqualizer::write (ProcParams* pp, ParamsEdited* pedited)
 void HSVEqualizer::curveChanged (CurveEditor* ce)
 {
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (ce == hshape) {
             listener->panelChanged (EvHSVEqualizerH, M("HISTORY_CUSTOMCURVE"));
         }
@@ -199,3 +202,17 @@ void HSVEqualizer::setBatchMode (bool batchMode)
 
     curveEditorG->setBatchMode (batchMode);
 }
+
+
+void HSVEqualizer::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged (EvHSVEqEnabled, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged (EvHSVEqEnabled, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged (EvHSVEqEnabled, M("GENERAL_DISABLED"));
+        }
+    }
+}
diff --git a/rtgui/hsvequalizer.h b/rtgui/hsvequalizer.h
index d02cc378c..fc3d22984 100644
--- a/rtgui/hsvequalizer.h
+++ b/rtgui/hsvequalizer.h
@@ -54,6 +54,7 @@ public:
     virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
 
     //void adjusterChanged (Adjuster* a, double newval);
+    void enabledChanged();
 };
 
 #endif
diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc
index c39dc99fc..8b2b2a217 100644
--- a/rtgui/labcurve.cc
+++ b/rtgui/labcurve.cc
@@ -24,7 +24,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"))
+LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"), false, true)
 {
 
     std::vector<GradientMilestone> milestones;
@@ -244,6 +244,8 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited)
         hhshape->setUnChanged  (!pedited->labCurve.hhcurve);
         lcshape->setUnChanged  (!pedited->labCurve.lccurve);
         clshape->setUnChanged  (!pedited->labCurve.clcurve);
+
+        set_inconsistent(multiImage && !pedited->labCurve.enabled);
     }
 
     brightness->setValue    (pp->labCurve.brightness);
@@ -277,6 +279,8 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited)
     lcshape->setCurve  (pp->labCurve.lccurve);
     clshape->setCurve  (pp->labCurve.clcurve);
 
+    setEnabled(pp->labCurve.enabled);
+    
     queue_draw();
 
     enableListener ();
@@ -338,7 +342,8 @@ void LCurve::setEditProvider  (EditDataProvider *provider)
 
 void LCurve::write (ProcParams* pp, ParamsEdited* pedited)
 {
-
+    pp->labCurve.enabled = getEnabled();
+    
     pp->labCurve.brightness    = brightness->getValue ();
     pp->labCurve.contrast      = (int)contrast->getValue ();
     pp->labCurve.chromaticity  = (int)chromaticity->getValue ();
@@ -380,7 +385,7 @@ void LCurve::write (ProcParams* pp, ParamsEdited* pedited)
         pedited->labCurve.lccurve   = !lcshape->isUnChanged ();
         pedited->labCurve.clcurve   = !clshape->isUnChanged ();
 
-
+        pedited->labCurve.enabled = !get_inconsistent();
     }
 
 }
@@ -424,7 +429,7 @@ void LCurve::avoidcolorshift_toggled ()
         lastACVal = avoidcolorshift->get_active ();
     }
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (avoidcolorshift->get_active ()) {
             listener->panelChanged (EvLAvoidColorShift, M("GENERAL_ENABLED"));
         } else {
@@ -451,7 +456,7 @@ void LCurve::lcredsk_toggled ()
         lcshape->refresh();
     }
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (lcredsk->get_active ()) {
             listener->panelChanged (EvLLCredsk, M("GENERAL_ENABLED"));
         } else {
@@ -471,7 +476,7 @@ void LCurve::lcredsk_toggled ()
 void LCurve::curveChanged (CurveEditor* ce)
 {
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (ce == lshape) {
             listener->panelChanged (EvLLCurve, M("HISTORY_CUSTOMCURVE"));
         }
@@ -526,15 +531,15 @@ void LCurve::adjusterChanged (Adjuster* a, double newval)
     }
 
     if (a == brightness) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLBrightness, costr);
         }
     } else if (a == contrast) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLContrast, costr);
         }
     } else if (a == rstprotection) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLRSTProtection, costr);
         }
     } else if (a == chromaticity) {
@@ -550,7 +555,7 @@ void LCurve::adjusterChanged (Adjuster* a, double newval)
             lcredsk->set_sensitive( int(newval) > -100 );
         }
 
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLSaturation, costr);
         }
     }
@@ -668,3 +673,16 @@ void LCurve::trimValues (rtengine::procparams::ProcParams* pp)
     contrast->trimValue(pp->labCurve.contrast);
     chromaticity->trimValue(pp->labCurve.chromaticity);
 }
+
+void LCurve::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged (EvLEnabled, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged (EvLEnabled, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged (EvLEnabled, M("GENERAL_DISABLED"));
+        }
+    }
+}
diff --git a/rtgui/labcurve.h b/rtgui/labcurve.h
index 403b49f9e..e0b912559 100644
--- a/rtgui/labcurve.h
+++ b/rtgui/labcurve.h
@@ -82,10 +82,7 @@ public:
 
     virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
 
-private:
-
-
-
+    void enabledChanged();
 };
 
 #endif
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index 42c21fca4..ea29079a0 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -82,6 +82,7 @@ void ParamsEdited::set (bool v)
     retinex.radius        = v;
 
     retinex.retinex = v;
+    labCurve.enabled = v;
     labCurve.lcurve      = v;
     labCurve.acurve      = v;
     labCurve.bcurve      = v;
@@ -97,6 +98,7 @@ void ParamsEdited::set (bool v)
     labCurve.avoidcolorshift = v;
     labCurve.rstprotection   = v;
     labCurve.lcredsk         = v;
+    rgbCurves.enabled = v;
     rgbCurves.lumamode       = v;
     rgbCurves.rcurve         = v;
     rgbCurves.gcurve         = v;
@@ -219,6 +221,7 @@ void ParamsEdited::set (bool v)
     //colorBoost.avoidclip      = v;
     //colorBoost.enable_saturationlimiter = v;
     //colorBoost.saturationlimit = v;
+    wb.enabled                 = v;
     wb.method                  = v;
     wb.green                   = v;
     wb.temperature             = v;
@@ -319,6 +322,7 @@ void ParamsEdited::set (bool v)
     vignetting.strength = v;
     vignetting.centerX = v;
     vignetting.centerY = v;
+    chmixer.enabled = v;
     chmixer.red[0] = v;
     chmixer.red[1] = v;
     chmixer.red[2] = v;
@@ -548,6 +552,7 @@ void ParamsEdited::set (bool v)
     dirpyrequalizer.skinprotect = v;
     dirpyrequalizer.hueskin = v;
     //dirpyrequalizer.algo = v;
+    hsvequalizer.enabled = v;
     hsvequalizer.hcurve = v;
     hsvequalizer.scurve = v;
     hsvequalizer.vcurve = v;
@@ -623,6 +628,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         retinex.radius = retinex.radius && p.retinex.radius == other.retinex.radius;
 
         retinex.enabled = retinex.enabled && p.retinex.enabled == other.retinex.enabled;
+        labCurve.enabled = labCurve.enabled && p.labCurve.enabled == other.labCurve.enabled;
         labCurve.lcurve = labCurve.lcurve && p.labCurve.lcurve == other.labCurve.lcurve;
         labCurve.acurve = labCurve.acurve && p.labCurve.acurve == other.labCurve.acurve;
         labCurve.bcurve = labCurve.bcurve && p.labCurve.bcurve == other.labCurve.bcurve;
@@ -638,6 +644,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         labCurve.avoidcolorshift = labCurve.avoidcolorshift && p.labCurve.avoidcolorshift == other.labCurve.avoidcolorshift;
         labCurve.rstprotection = labCurve.rstprotection && p.labCurve.rstprotection == other.labCurve.rstprotection;
         labCurve.lcredsk = labCurve.lcredsk && p.labCurve.lcredsk == other.labCurve.lcredsk;
+        rgbCurves.enabled = rgbCurves.enabled && p.rgbCurves.enabled == other.rgbCurves.enabled;
         rgbCurves.lumamode = rgbCurves.lumamode && p.rgbCurves.lumamode == other.rgbCurves.lumamode;
         rgbCurves.rcurve = rgbCurves.rcurve && p.rgbCurves.rcurve == other.rgbCurves.rcurve;
         rgbCurves.gcurve = rgbCurves.gcurve && p.rgbCurves.gcurve == other.rgbCurves.gcurve;
@@ -759,6 +766,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         //colorBoost.avoidclip = colorBoost.avoidclip && p.colorBoost.avoidclip == other.colorBoost.avoidclip;
         //colorBoost.enable_saturationlimiter = colorBoost.enable_saturationlimiter && p.colorBoost.enable_saturationlimiter == other.colorBoost.enable_saturationlimiter;
         //colorBoost.saturationlimit = colorBoost.saturationlimit && p.colorBoost.saturationlimit == other.colorBoost.saturationlimit;
+        wb.enabled = wb.enabled && p.wb.enabled == other.wb.enabled;
         wb.method = wb.method && p.wb.method == other.wb.method;
         wb.green = wb.green && p.wb.green == other.wb.green;
         wb.equal = wb.equal && p.wb.equal == other.wb.equal;
@@ -864,6 +872,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         vignetting.strength = vignetting.strength && p.vignetting.strength == other.vignetting.strength;
         vignetting.centerX = vignetting.centerX && p.vignetting.centerX == other.vignetting.centerX;
         vignetting.centerY = vignetting.centerY && p.vignetting.centerY == other.vignetting.centerY;
+        chmixer.enabled = chmixer.enabled && p.chmixer.enabled == other.chmixer.enabled;
         chmixer.red[0] = chmixer.red[0] && p.chmixer.red[0] == other.chmixer.red[0];
         chmixer.red[1] = chmixer.red[1] && p.chmixer.red[1] == other.chmixer.red[1];
         chmixer.red[2] = chmixer.red[2] && p.chmixer.red[2] == other.chmixer.red[2];
@@ -1086,6 +1095,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         dirpyrequalizer.skinprotect = dirpyrequalizer.skinprotect && p.dirpyrequalizer.skinprotect == other.dirpyrequalizer.skinprotect;
         //    dirpyrequalizer.algo = dirpyrequalizer.algo && p.dirpyrequalizer.algo == other.dirpyrequalizer.algo;
         dirpyrequalizer.hueskin = dirpyrequalizer.hueskin && p.dirpyrequalizer.hueskin == other.dirpyrequalizer.hueskin;
+        hsvequalizer.enabled = hsvequalizer.enabled && p.hsvequalizer.enabled == other.hsvequalizer.enabled;        
         hsvequalizer.hcurve = hsvequalizer.hcurve && p.hsvequalizer.hcurve == other.hsvequalizer.hcurve;
         hsvequalizer.scurve = hsvequalizer.scurve && p.hsvequalizer.scurve == other.hsvequalizer.scurve;
         hsvequalizer.vcurve = hsvequalizer.vcurve && p.hsvequalizer.vcurve == other.hsvequalizer.vcurve;
@@ -1298,6 +1308,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
     }
 
 
+    if (labCurve.enabled) {
+        toEdit.labCurve.enabled = mods.labCurve.enabled;
+    }
+    
     if (labCurve.lcurve) {
         toEdit.labCurve.lcurve        = mods.labCurve.lcurve;
     }
@@ -1358,6 +1372,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
         toEdit.labCurve.lcredsk     = mods.labCurve.lcredsk;
     }
 
+    if (rgbCurves.enabled) {
+        toEdit.rgbCurves.enabled = mods.rgbCurves.enabled;
+    }
+
     if (rgbCurves.lumamode) {
         toEdit.rgbCurves.lumamode   = mods.rgbCurves.lumamode;
     }
@@ -1666,6 +1684,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
     //if (colorBoost.avoidclip)             toEdit.colorBoost.avoidclip     = mods.colorBoost.avoidclip;
     //if (colorBoost.enable_saturationlimiter)toEdit.colorBoost.enable_saturationlimiter    = mods.colorBoost.enable_saturationlimiter;
     //if (colorBoost.saturationlimit)           toEdit.colorBoost.saturationlimit   = mods.colorBoost.saturationlimit;
+    if (wb.enabled) {
+        toEdit.wb.enabled = mods.wb.enabled;
+    }
+    
     if (wb.method) {
         toEdit.wb.method  = mods.wb.method;
     }
@@ -2191,6 +2213,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
         toEdit.vignetting.centerY = dontforceSet && options.baBehav[ADDSET_VIGN_CENTER] ? toEdit.vignetting.centerY + mods.vignetting.centerY : mods.vignetting.centerY;
     }
 
+    if (chmixer.enabled) {
+        toEdit.chmixer.enabled = mods.chmixer.enabled;
+    }
+    
     for (int i = 0; i < 3; i++) {
         if (chmixer.red[i]) {
             toEdit.chmixer.red[i]     = dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.red[i] + mods.chmixer.red[i] : mods.chmixer.red[i];
@@ -3014,6 +3040,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
     }
 
 //  if (dirpyrequalizer.algo)       toEdit.dirpyrequalizer.algo     = mods.dirpyrequalizer.algo;
+    if (hsvequalizer.enabled) {
+        toEdit.hsvequalizer.enabled = mods.hsvequalizer.enabled;
+    }
+    
     if (hsvequalizer.hcurve) {
         toEdit.hsvequalizer.hcurve        = mods.hsvequalizer.hcurve;
     }
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index 210760680..2727f01ec 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -100,6 +100,7 @@ public:
 class LCurveParamsEdited
 {
 public:
+    bool enabled;
     bool brightness;
     bool contrast;
     bool chromaticity;
@@ -115,14 +116,13 @@ public:
     bool hhcurve;
     bool lccurve;
     bool clcurve;
-    bool enabled;
-    bool method;
 };
 
 class RGBCurvesParamsEdited
 {
 
 public:
+    bool enabled;
     bool lumamode;
     bool rcurve;
     bool gcurve;
@@ -229,6 +229,7 @@ class WBParamsEdited
 {
 
 public:
+    bool enabled;
     bool method;
     bool temperature;
     bool green;
@@ -487,6 +488,7 @@ class ChannelMixerParamsEdited
 {
 
 public:
+    bool enabled;
     bool red[3];
     bool green[3];
     bool blue[3];
@@ -677,6 +679,7 @@ class HSVEqualizerParamsEdited
 {
 
 public:
+    bool enabled;
     bool hcurve;
     bool scurve;
     bool vcurve;
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index 6683bc57b..4b5c7a857 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -379,14 +379,14 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
 void PartialPasteDlg::everythingToggled ()
 {
 
-    basicConn.block (true);
-    detailConn.block (true);
-    colorConn.block (true);
-    lensConn.block (true);
-    compositionConn.block (true);
-    metaConn.block (true);
-    rawConn.block (true);
-    wavConn.block (true);
+    ConnectionBlocker basicBlocker(basicConn);
+    ConnectionBlocker detailBlocker(detailConn);
+    ConnectionBlocker colorBlocker(colorConn);
+    ConnectionBlocker lensBlocker(lensConn);
+    ConnectionBlocker compositionBlocker(compositionConn);
+    ConnectionBlocker metaBlocker(metaConn);
+    ConnectionBlocker rawBlocker(rawConn);
+    ConnectionBlocker wavBlocker(wavConn);
 
     everything->set_inconsistent (false);
 
@@ -409,44 +409,35 @@ void PartialPasteDlg::everythingToggled ()
     PartialPasteDlg::metaToggled ();
     PartialPasteDlg::rawToggled ();
     PartialPasteDlg::wavToggled ();
-
-    basicConn.block (false);
-    detailConn.block (false);
-    colorConn.block (false);
-    lensConn.block (false);
-    compositionConn.block (false);
-    metaConn.block (false);
-    rawConn.block (false);
-    wavConn.block (false);
 }
 
 void PartialPasteDlg::rawToggled ()
 {
 
-    raw_methodConn.block (true);
-    raw_imagenumConn.block (true);
-    raw_ccStepsConn.block (true);
-    raw_dcb_iterationsConn.block (true);
-    raw_dcb_enhanceConn.block (true);
-    //raw_all_enhanceConn.block (true);
-    raw_lmmse_iterationsConn.block (true);
-    raw_pixelshiftConn.block (true);
-    raw_exposConn.block (true);
-    raw_preserConn.block (true);
-    raw_blackConn.block (true);
-    raw_ca_autocorrectConn.block (true);
-    raw_caredblueConn.block (true);
-    raw_hotpix_filtConn.block (true);
-    raw_deadpix_filtConn.block (true);
-    raw_linenoiseConn.block (true);
-    raw_greenthreshConn.block (true);
-    df_fileConn.block (true);
-    df_AutoSelectConn.block (true);
-    ff_fileConn.block (true);
-    ff_AutoSelectConn.block (true);
-    ff_BlurRadiusConn.block (true);
-    ff_BlurTypeConn.block (true);
-    ff_ClipControlConn.block (true);
+    ConnectionBlocker raw_methodBlocker(raw_methodConn);
+    ConnectionBlocker raw_imagenumBlocker(raw_imagenumConn);
+    ConnectionBlocker raw_ccStepsBlocker(raw_ccStepsConn);
+    ConnectionBlocker raw_dcb_iterationsBlocker(raw_dcb_iterationsConn);
+    ConnectionBlocker raw_dcb_enhanceBlocker(raw_dcb_enhanceConn);
+    //ConnectionBlocker raw_all_enhanceConnBlocker(raw_all_enhanceConnConn);
+    ConnectionBlocker raw_lmmse_iterationsBlocker(raw_lmmse_iterationsConn);
+    ConnectionBlocker raw_pixelshiftBlocker(raw_pixelshiftConn);
+    ConnectionBlocker raw_exposBlocker(raw_exposConn);
+    ConnectionBlocker raw_preserBlocker(raw_preserConn);
+    ConnectionBlocker raw_blackBlocker(raw_blackConn);
+    ConnectionBlocker raw_ca_autocorrectBlocker(raw_ca_autocorrectConn);
+    ConnectionBlocker raw_caredblueBlocker(raw_caredblueConn);
+    ConnectionBlocker raw_hotpix_filtBlocker(raw_hotpix_filtConn);
+    ConnectionBlocker raw_deadpix_filtBlocker(raw_deadpix_filtConn);
+    ConnectionBlocker raw_linenoiseBlocker(raw_linenoiseConn);
+    ConnectionBlocker raw_greenthreshBlocker(raw_greenthreshConn);
+    ConnectionBlocker df_fileBlocker(df_fileConn);
+    ConnectionBlocker df_AutoSelectBlocker(df_AutoSelectConn);
+    ConnectionBlocker ff_fileBlocker(ff_fileConn);
+    ConnectionBlocker ff_AutoSelectBlocker(ff_AutoSelectConn);
+    ConnectionBlocker ff_BlurRadiusBlocker(ff_BlurRadiusConn);
+    ConnectionBlocker ff_BlurTypeBlocker(ff_BlurTypeConn);
+    ConnectionBlocker ff_ClipControlBlocker(ff_ClipControlConn);
 
     raw->set_inconsistent (false);
 
@@ -474,45 +465,21 @@ void PartialPasteDlg::rawToggled ()
     ff_BlurRadius->set_active (raw->get_active ());
     ff_BlurType->set_active (raw->get_active ());
     ff_ClipControl->set_active (raw->get_active ());
-
-    raw_methodConn.block (false);
-    raw_imagenumConn.block (false);
-    raw_ccStepsConn.block (false);
-    raw_dcb_iterationsConn.block (false);
-    raw_dcb_enhanceConn.block (false);
-    //raw_all_enhanceConn.block (false);
-    raw_pixelshiftConn.block (false);
-    raw_lmmse_iterationsConn.block (false);
-    raw_exposConn.block (false);
-    raw_preserConn.block (false);
-    raw_blackConn.block (false);
-    raw_ca_autocorrectConn.block (false);
-    raw_caredblueConn.block (false);
-    raw_hotpix_filtConn.block (false);
-    raw_deadpix_filtConn.block (false);
-    raw_linenoiseConn.block (false);
-    raw_greenthreshConn.block (false);
-    df_fileConn.block (false);
-    df_AutoSelectConn.block (false);
-    ff_fileConn.block (false);
-    ff_AutoSelectConn.block (false);
-    ff_BlurRadiusConn.block (false);
-    ff_BlurTypeConn.block (false);
-    ff_ClipControlConn.block (false);
 }
 
 void PartialPasteDlg::basicToggled ()
 {
 
-    wbConn.block (true);
-    exposureConn.block (true);
-    shConn.block (true);
-    epdConn.block(true);
-    pcvignetteConn.block (true);
-    gradientConn.block (true);
-    labcurveConn.block (true);
-    colorappearanceConn.block (true);
-    retinexConn.block (true);
+    ConnectionBlocker wbBlocker(wbConn);
+    ConnectionBlocker exposureBlocker(exposureConn);
+    ConnectionBlocker shBlocker(shConn);
+    ConnectionBlocker epdBlocker(epdConn);
+    ConnectionBlocker fattalBlocker(fattalConn);
+    ConnectionBlocker pcvignetteBlocker(pcvignetteConn);
+    ConnectionBlocker gradientBlocker(gradientConn);
+    ConnectionBlocker retinexBlocker(retinexConn);
+    ConnectionBlocker labcurveBlocker(labcurveConn);
+    ConnectionBlocker colorappearanceBlocker(colorappearanceConn);
 
     basic->set_inconsistent (false);
 
@@ -526,29 +493,18 @@ void PartialPasteDlg::basicToggled ()
     retinex->set_active (basic->get_active ());
     labcurve->set_active (basic->get_active ());
     colorappearance->set_active (basic->get_active ());
-
-    wbConn.block (false);
-    exposureConn.block (false);
-    shConn.block (false);
-    epdConn.block (false);
-    pcvignetteConn.block (false);
-    gradientConn.block (false);
-    retinexConn.block (false);
-    
-    labcurveConn.block (false);
-    colorappearanceConn.block (false);
 }
 
 void PartialPasteDlg::detailToggled ()
 {
 
-    sharpenConn.block (true);
-    gradsharpenConn.block(true);
-    microcontrastConn.block(true);
-    impdenConn.block (true);
-    dirpyrdenConn.block (true);
-    defringeConn.block (true);
-    dirpyreqConn.block (true);
+    ConnectionBlocker sharpenBlocker(sharpenConn);
+    ConnectionBlocker gradsharpenBlocker(gradsharpenConn);
+    ConnectionBlocker microcontrastBlocker(microcontrastConn);
+    ConnectionBlocker impdenBlocker(impdenConn);
+    ConnectionBlocker dirpyrdenBlocker(dirpyrdenConn);
+    ConnectionBlocker defringeBlocker(defringeConn);
+    ConnectionBlocker dirpyreqBlocker(dirpyreqConn);
 
     detail->set_inconsistent (false);
 
@@ -559,41 +515,32 @@ void PartialPasteDlg::detailToggled ()
     dirpyrden->set_active (detail->get_active ());
     defringe->set_active (detail->get_active ());
     dirpyreq->set_active (detail->get_active ());
-
-    sharpenConn.block (false);
-    gradsharpenConn.block(false);
-    microcontrastConn.block(false);
-    impdenConn.block (false);
-    dirpyrdenConn.block (false);
-    defringeConn.block (false);
-    dirpyreqConn.block (false);
 }
 
 void PartialPasteDlg::wavToggled ()
 {
 
-    waveletConn.block (true);
+    ConnectionBlocker waveletBlocker(waveletConn);
 
     wav->set_inconsistent (false);
     wavelet->set_active (wav->get_active ());
-
-    waveletConn.block (false);
 }
 
 void PartialPasteDlg::colorToggled ()
 {
 
-    icmConn.block (true);
-    //gamcsconn.block (true);
-    vibranceConn.block (true);
-    chmixerConn.block (true);
-    chmixerbwConn.block (true);
-    hsveqConn.block (true);
-    filmSimulationConn.block (true);
-    rgbcurvesConn.block (true);
-    colortoningConn.block (true);
+    ConnectionBlocker icmBlocker(icmConn);
+    ConnectionBlocker vibranceBlocker(vibranceConn);
+    ConnectionBlocker chmixerBlocker(chmixerConn);
+    ConnectionBlocker chmixerbwBlocker(chmixerbwConn);
+    ConnectionBlocker hsveqBlocker(hsveqConn);
+    ConnectionBlocker filmSimulationBlocker(filmSimulationConn);
+    //ConnectionBlocker gamcsconnBlocker(gamcsconnConn);
+    ConnectionBlocker rgbcurvesBlocker(rgbcurvesConn);
+    ConnectionBlocker colortoningBlocker(colortoningConn);
 
     color->set_inconsistent (false);
+
     icm->set_active (color->get_active ());
     //gam->set_active (color->get_active ());
     vibrance->set_active (color->get_active ());
@@ -603,25 +550,15 @@ void PartialPasteDlg::colorToggled ()
     filmSimulation->set_active (color->get_active ());
     rgbcurves->set_active (color->get_active ());
     colortoning->set_active(color->get_active ());
-
-    icmConn.block (false);
-    //gamcsconn.block (false);
-    vibranceConn.block (false);
-    chmixerbwConn.block (false);
-    chmixerConn.block (false);
-    hsveqConn.block (false);
-    filmSimulationConn.block (false);
-    rgbcurvesConn.block (false);
-    colortoningConn.block (false);
 }
 
 void PartialPasteDlg::lensToggled ()
 {
 
-    distortionConn.block (true);
-    cacorrConn.block (true);
-    vignettingConn.block (true);
-    lcpConn.block (true);
+    ConnectionBlocker distortionBlocker(distortionConn);
+    ConnectionBlocker cacorrBlocker(cacorrConn);
+    ConnectionBlocker vignettingBlocker(vignettingConn);
+    ConnectionBlocker lcpBlocker(lcpConn);
 
     lens->set_inconsistent (false);
 
@@ -629,23 +566,18 @@ void PartialPasteDlg::lensToggled ()
     cacorr->set_active (lens->get_active ());
     vignetting->set_active (lens->get_active ());
     lcp->set_active (lens->get_active ());
-
-    distortionConn.block (false);
-    cacorrConn.block (false);
-    vignettingConn.block (false);
-    lcpConn.block (false);
 }
 
 void PartialPasteDlg::compositionToggled ()
 {
 
-    coarserotConn.block (true);
-    finerotConn.block (true);
-    cropConn.block (true);
-    resizeConn.block (true);
-    prsharpeningConn.block (true);
-    perspectiveConn.block (true);
-    commonTransConn.block (true);
+    ConnectionBlocker coarserotBlocker(coarserotConn);
+    ConnectionBlocker finerotBlocker(finerotConn);
+    ConnectionBlocker cropBlocker(cropConn);
+    ConnectionBlocker resizeBlocker(resizeConn);
+    ConnectionBlocker prsharpeningBlocker(prsharpeningConn);
+    ConnectionBlocker perspectiveBlocker(perspectiveConn);
+    ConnectionBlocker commonTransBlocker(commonTransConn);
 
     composition->set_inconsistent (false);
 
@@ -656,28 +588,18 @@ void PartialPasteDlg::compositionToggled ()
     prsharpening->set_active (composition->get_active ());
     perspective->set_active (composition->get_active ());
     commonTrans->set_active (composition->get_active ());
-
-    coarserotConn.block (false);
-    finerotConn.block (false);
-    cropConn.block (false);
-    resizeConn.block (false);
-    prsharpeningConn.block (false);
-    perspectiveConn.block (false);
-    commonTransConn.block (false);
 }
 
 void PartialPasteDlg::metaToggled ()
 {
 
-    exifchConn.block (true);
-    iptcConn.block (true);
+    ConnectionBlocker exifchBlocker(exifchConn);
+    ConnectionBlocker iptcBlocker(iptcConn);
+
     meta->set_inconsistent (false);
 
     exifch->set_active (meta->get_active ());
     iptc->set_active (meta->get_active ());
-
-    exifchConn.block (false);
-    iptcConn.block (false);
 }
 
 
diff --git a/rtgui/ppversion.h b/rtgui/ppversion.h
index d799be406..c6f2598b0 100644
--- a/rtgui/ppversion.h
+++ b/rtgui/ppversion.h
@@ -1,11 +1,13 @@
 #pragma once
 
 // This number has to be incremented whenever the PP3 file format is modified or the behaviour of a tool changes
-#define PPVERSION 328
+#define PPVERSION 329
 #define PPVERSION_AEXP 301 //value of PPVERSION when auto exposure algorithm was modified
 
 /*
   Log of version changes
+   329  2017-12-09
+        Added 'Enabled' flag for Channel Mixer, RGB Curves and HSV Equalizer
    328  2017-11-22
         Fix wrong type of ff_clipControl
    327  2017-09-15
diff --git a/rtgui/rgbcurves.cc b/rtgui/rgbcurves.cc
index d9c970f7a..d32633bf4 100644
--- a/rtgui/rgbcurves.cc
+++ b/rtgui/rgbcurves.cc
@@ -21,7 +21,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_LABEL"))
+RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_LABEL"), false, true)
 {
 
     lumamode = Gtk::manage (new Gtk::CheckButton (M("TP_RGBCURVES_LUMAMODE")));
@@ -84,6 +84,7 @@ void RGBCurves::read (const ProcParams* pp, const ParamsEdited* pedited)
         Gshape->setUnChanged (!pedited->rgbCurves.gcurve);
         Bshape->setUnChanged (!pedited->rgbCurves.bcurve);
         lumamode->set_inconsistent (!pedited->rgbCurves.lumamode);
+        set_inconsistent(multiImage && !pedited->rgbCurves.enabled);
     }
 
     lumamodeConn.block (true);
@@ -96,6 +97,8 @@ void RGBCurves::read (const ProcParams* pp, const ParamsEdited* pedited)
     Gshape->setCurve         (pp->rgbCurves.gcurve);
     Bshape->setCurve         (pp->rgbCurves.bcurve);
 
+    setEnabled(pp->rgbCurves.enabled);
+
     enableListener ();
 }
 
@@ -122,13 +125,14 @@ void RGBCurves::autoOpenCurve  ()
 
 void RGBCurves::write (ProcParams* pp, ParamsEdited* pedited)
 {
-
+    pp->rgbCurves.enabled = getEnabled();
     pp->rgbCurves.rcurve         = Rshape->getCurve ();
     pp->rgbCurves.gcurve         = Gshape->getCurve ();
     pp->rgbCurves.bcurve         = Bshape->getCurve ();
     pp->rgbCurves.lumamode       = lumamode->get_active();
 
     if (pedited) {
+        pedited->rgbCurves.enabled = !get_inconsistent();
         pedited->rgbCurves.rcurve    = !Rshape->isUnChanged ();
         pedited->rgbCurves.gcurve    = !Gshape->isUnChanged ();
         pedited->rgbCurves.bcurve    = !Bshape->isUnChanged ();
@@ -146,7 +150,7 @@ void RGBCurves::write (ProcParams* pp, ParamsEdited* pedited)
 void RGBCurves::curveChanged (CurveEditor* ce)
 {
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (ce == Rshape) {
             listener->panelChanged (EvRGBrCurve, M("HISTORY_CUSTOMCURVE"));
         }
@@ -177,7 +181,7 @@ void RGBCurves::lumamodeChanged ()
         lastLumamode = lumamode->get_active ();
     }
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (lumamode->get_active ()) {
             listener->panelChanged (EvRGBrCurveLumamode, M("GENERAL_ENABLED"));
         } else {
@@ -202,3 +206,16 @@ void RGBCurves::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & his
     //  Bshape->updateBackgroundHistogram (histBlue);
 }
 
+
+void RGBCurves::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged(EvRGBEnabled, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged(EvRGBEnabled, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged(EvRGBEnabled, M("GENERAL_DISABLED"));
+        }
+    }
+}
diff --git a/rtgui/rgbcurves.h b/rtgui/rgbcurves.h
index efca76422..dfcba71f9 100644
--- a/rtgui/rgbcurves.h
+++ b/rtgui/rgbcurves.h
@@ -53,6 +53,7 @@ public:
     void curveChanged (CurveEditor* ce);
     void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, /*LUTu & histCLurve,  LUTu & histLLCurve,*/ LUTu & histLCAM,  LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI);
     void lumamodeChanged  ();
+    void enabledChanged();
 };
 
 #endif
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 7dbc02b4e..57d73b15f 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -147,7 +147,7 @@ static double wbTemp2Slider(double temp)
     return sval;
 }
 
-WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WBALANCE_LABEL")), wbp(nullptr), wblistener(nullptr)
+WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WBALANCE_LABEL"), false, true), wbp(nullptr), wblistener(nullptr)
 {
 
     Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ());
@@ -349,9 +349,23 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
     spotsize->signal_changed().connect( sigc::mem_fun(*this, &WhiteBalance::spotSizeChanged) );
 }
 
+
+void WhiteBalance::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged(EvWBEnabled, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged(EvWBEnabled, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged(EvWBEnabled, M("GENERAL_DISABLED"));
+        }
+    }
+}
+
+
 void WhiteBalance::adjusterChanged (Adjuster* a, double newval)
 {
-
     int tVal = (int)temp->getValue();
     double gVal = green->getValue();
     double eVal = equal->getValue();
@@ -400,7 +414,7 @@ void WhiteBalance::adjusterChanged (Adjuster* a, double newval)
 
         // Recomputing AutoWB if it's the current method will happen in improccoordinator.cc
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (a == temp) {
             listener->panelChanged (EvWBTemp, Glib::ustring::format ((int)a->getValue()));
         } else if (a == green) {
@@ -415,7 +429,6 @@ void WhiteBalance::adjusterChanged (Adjuster* a, double newval)
 
 void WhiteBalance::optChanged ()
 {
-
     Gtk::TreeModel::Row row = getActiveMethod();
 
     if (row == refTreeModel->children().end()) {
@@ -520,7 +533,7 @@ void WhiteBalance::optChanged ()
             }
         }
 
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvWBMethod, row[methodColumns.colLabel]);
         }
     }
@@ -528,7 +541,6 @@ void WhiteBalance::optChanged ()
 
 void WhiteBalance::spotPressed ()
 {
-
     if (wblistener) {
         wblistener->spotWBRequested (getSize());
     }
@@ -667,6 +679,11 @@ void WhiteBalance::read (const ProcParams* pp, const ParamsEdited* pedited)
         tempBias->set_sensitive(wbValues.type == WBEntry::Type::AUTO);
     }
 
+    setEnabled(pp->wb.enabled);
+    if (pedited) {
+        set_inconsistent(multiImage && !pedited->wb.enabled);
+    }
+
     methconn.block (false);
     enableListener ();
 }
@@ -682,8 +699,11 @@ void WhiteBalance::write (ProcParams* pp, ParamsEdited* pedited)
         pedited->wb.equal = equal->getEditedState ();
         pedited->wb.tempBias = tempBias->getEditedState ();
         pedited->wb.method = row[methodColumns.colLabel] != M("GENERAL_UNCHANGED");
+        pedited->wb.enabled = !get_inconsistent();
     }
 
+    pp->wb.enabled = getEnabled();
+
     const std::pair<bool, const WBEntry&> ppMethod = findWBEntry (row[methodColumns.colLabel], WBLT_GUI);
 
     if (ppMethod.first) {
@@ -756,6 +776,7 @@ void WhiteBalance::setWB (int vtemp, double vgreen)
 
     methconn.block(true);
     const std::pair<bool, const WBEntry&> wbValues = findWBEntry("Custom", WBLT_PP);
+    setEnabled(true);
     temp->setValue (vtemp);
     green->setValue (vgreen);
     opt = setActiveMethod(wbValues.second.GUILabel);
@@ -876,6 +897,7 @@ void WhiteBalance::WBChanged(double temperature, double greenVal)
 {
     GThreadLock lock;
     disableListener();
+    setEnabled(true);
     temp->setValue(temperature);
     green->setValue(greenVal);
     temp->setDefault(temperature);
diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h
index d1fafcea3..ecf65f476 100644
--- a/rtgui/whitebalance.h
+++ b/rtgui/whitebalance.h
@@ -119,6 +119,7 @@ public:
 
     void setAdjusterBehavior (bool tempadd, bool greenadd, bool equaladd, bool tempbiasadd);
     void trimValues          (rtengine::procparams::ProcParams* pp);
+    void enabledChanged();
 };
 
 #endif
diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 8b9cbccb6..20a140ce5 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -156,7 +156,13 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme
 
 # Copy the Lensfun database into the app bundle
 mkdir -p "${RESOURCES}/share/lensfun"
-cp /opt/local/share/lensfun/version_1/* "${RESOURCES}/share/lensfun"
+cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
+
+# Copy liblensfun to Frameworks
+cp /opt/local/lib/liblensfun.1.dylib "${RESOURCES}/../Frameworks"
+
+# Copy libiomp5 to Frameworks
+cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks"
 
 # Copy the libiomp5 license into the app bundle
 cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"