diff --git a/custom_components/ims/config_flow.py b/custom_components/ims/config_flow.py
index 39927d4..f0372a5 100644
--- a/custom_components/ims/config_flow.py
+++ b/custom_components/ims/config_flow.py
@@ -132,8 +132,8 @@ async def async_step_user(self, user_input=None):
                 vol.Required(CONF_MODE, default=DEFAULT_FORECAST_MODE): vol.In(
                     FORECAST_MODES
                 ),
-                vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_DESCRIPTIONS_KEYS): cv.multi_select(
-                    SENSOR_DESCRIPTIONS_KEYS
+                vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_KEYS): cv.multi_select(
+                    SENSOR_KEYS
                 ),
                 vol.Required(CONF_IMAGES_PATH, default="/tmp"): cv.string,
             }
diff --git a/custom_components/ims/translations/en.json b/custom_components/ims/translations/en.json
index af60c68..7f6363d 100644
--- a/custom_components/ims/translations/en.json
+++ b/custom_components/ims/translations/en.json
@@ -45,6 +45,22 @@
         }
     },
   "entity": {
+    "binary_sensor": {
+      "ims_is_raining_he": {
+        "name": "גשם",
+        "state": {
+          "on": "יורד",
+          "off": "לא יורד"
+        }
+      },
+      "ims_is_raining_en": {
+        "name": "Rain",
+        "state": {
+          "on": "Raining",
+          "off": "Not Raining"
+        }
+      }
+    },
     "sensor": {
       "ims_city_he": {
         "name": "ישוב"
@@ -64,20 +80,6 @@
       "ims_wind_speed_en": {
         "name": "Wind Speed"
       },
-      "ims_is_raining_he": {
-        "name": "גשם",
-        "state": {
-          "raining": "יורד",
-          "not_raining": "לא יורד"
-        }
-      },
-      "ims_is_raining_en": {
-        "name": "Rain",
-        "state": {
-          "raining": "Raining",
-          "not_raining": "Not Raining"
-        }
-      },
       "ims_precipitation_he": {
         "name": "משקעים"
       },
diff --git a/custom_components/ims/translations/he.json b/custom_components/ims/translations/he.json
index 921541b..3485350 100644
--- a/custom_components/ims/translations/he.json
+++ b/custom_components/ims/translations/he.json
@@ -45,6 +45,22 @@
         }
     },
   "entity": {
+    "binary_sensor": {
+      "ims_is_raining_he": {
+        "name": "גשם",
+        "state": {
+          "on": "יורד",
+          "off": "לא יורד"
+        }
+      },
+      "ims_is_raining_en": {
+        "name": "Rain",
+        "state": {
+          "on": "Raining",
+          "off": "Not Raining"
+        }
+      }
+    },
     "sensor": {
       "ims_city_he": {
         "name": "ישוב"
@@ -64,20 +80,6 @@
       "ims_wind_speed_en": {
         "name": "Wind Speed"
       },
-      "ims_is_raining_he": {
-        "name": "גשם",
-        "state": {
-          "raining": "יורד",
-          "not_raining": "לא יורד"
-        }
-      },
-      "ims_is_raining_en": {
-        "name": "Rain",
-        "state": {
-          "raining": "Raining",
-          "not_raining": "Not Raining"
-        }
-      },
       "ims_precipitation_he": {
         "name": "משקעים"
       },
diff --git a/custom_components/ims/translations/pt.json b/custom_components/ims/translations/pt.json
index 02f2997..f7baf15 100644
--- a/custom_components/ims/translations/pt.json
+++ b/custom_components/ims/translations/pt.json
@@ -43,6 +43,22 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "ims_is_raining_he": {
+        "name": "Chuva",
+        "state": {
+          "on": "A chover",
+          "off": "Não está a chover"
+        }
+      },
+      "ims_is_raining_en": {
+        "name": "Chuva",
+        "state": {
+          "on": "A chover",
+          "off": "Não está a chover"
+        }
+      }
+    },
     "sensor": {
       "ims_city_he": {
         "name": "Localidade"
@@ -62,20 +78,6 @@
       "ims_wind_speed_en": {
         "name": "Velocidade do Vento"
       },
-      "ims_is_raining_he": {
-        "name": "Chuva",
-        "state": {
-          "raining": "A chover",
-          "not_raining": "Não está a chover"
-        }
-      },
-      "ims_is_raining_en": {
-        "name": "Chuva",
-        "state": {
-          "raining": "A chover",
-          "not_raining": "Não está a chover"
-        }
-      },
       "ims_precipitation_he": {
         "name": "Precipitação"
       },