diff --git a/app/ecolyo.a1d597005ae46556d655.js b/app/ecolyo.59526866a2d5805f2524.js
similarity index 99%
rename from app/ecolyo.a1d597005ae46556d655.js
rename to app/ecolyo.59526866a2d5805f2524.js
index 00cf0dd81b3ad54ee303f952fcb3c6ef104899e6..aca2d4b58725633964d59323cfb1ba9d10c1db77 100644
--- a/app/ecolyo.a1d597005ae46556d655.js
+++ b/app/ecolyo.59526866a2d5805f2524.js
@@ -22786,7 +22786,7 @@ var _interopRequireDefault = __webpack_require__("TqRt");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -22822,6 +22822,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+/** Array of elec, water & gas */
+var allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':
diff --git a/index.html b/index.html
index aeb8c6328f3570c75b383a2282c4378c696438f8..23bd8e3010d339f33b8b0d42610f20f3a5dd0d92 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.796f5a66f0367dd5452d.js"></script><script src="app/ecolyo.a1d597005ae46556d655.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.796f5a66f0367dd5452d.js"></script><script src="app/ecolyo.59526866a2d5805f2524.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 8922ab19cc4272d86bc77af24483b0934482ac8d..7dba9a6fe4ec9787fd0d988bab32adac3bf26081 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -99805,7 +99805,7 @@ var _interopRequireDefault = __webpack_require__(1);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -99829,6 +99829,10 @@ var _luxon = __webpack_require__(140);
 
 var _challengeEntity = _interopRequireDefault(__webpack_require__(757));
 
+/** Array of elec, water & gas */
+const allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 9a911b6593e53863c67934eb0aba6869c380e906..bb645076d8c86631d81df733e0f0659590004e29 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -97915,7 +97915,7 @@ var _interopRequireDefault = __webpack_require__(1);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -97939,6 +97939,10 @@ var _luxon = __webpack_require__(140);
 
 var _challengeEntity = _interopRequireDefault(__webpack_require__(757));
 
+/** Array of elec, water & gas */
+const allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 71404915fd4572d449f3451f39bc2ba1f6d2888e..30e15a10a24486fe021ba9784e7a69013cbdc458 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -97915,7 +97915,7 @@ var _interopRequireDefault = __webpack_require__(1);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -97939,6 +97939,10 @@ var _luxon = __webpack_require__(140);
 
 var _challengeEntity = _interopRequireDefault(__webpack_require__(757));
 
+/** Array of elec, water & gas */
+const allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index e49b5ea72159a5f2b38b3faee54e1b9caf488060..9cf430352257d2936267b7a65be579cf2b6c73a2 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -97915,7 +97915,7 @@ var _interopRequireDefault = __webpack_require__(1);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -97939,6 +97939,10 @@ var _luxon = __webpack_require__(140);
 
 var _challengeEntity = _interopRequireDefault(__webpack_require__(757));
 
+/** Array of elec, water & gas */
+const allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 385bcf597962ffdb95da23421c28b1a00a93c7dd..1307324d1857e39ee9c79c9a85b60276146914c9 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -97915,7 +97915,7 @@ var _interopRequireDefault = __webpack_require__(1);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatListWithAnd = void 0;
+exports.formatListWithAnd = exports.allFluids = void 0;
 exports.formatNumberValues = formatNumberValues;
 exports.getChallengeTitleWithLineReturn = void 0;
 exports.getFluidName = getFluidName;
@@ -97939,6 +97939,10 @@ var _luxon = __webpack_require__(140);
 
 var _challengeEntity = _interopRequireDefault(__webpack_require__(757));
 
+/** Array of elec, water & gas */
+const allFluids = [_enums.FluidType.ELECTRICITY, _enums.FluidType.WATER, _enums.FluidType.GAS];
+exports.allFluids = allFluids;
+
 function getFluidType(type) {
   switch (type.toUpperCase()) {
     case 'ELECTRICITY':