diff --git a/integration b/integration
index 73983f1c47..24238066a8 100644
--- a/integration
+++ b/integration
@@ -72,7 +72,6 @@
   "Archef2000/homeassistant-upsplus",
   "ardevd/ha-bobcatminer",
   "arifwn/homeassistant-whatspie-integration",
-  "arjenvrh/audi_connect_ha",
   "asantaga/lightwaverf_HA_EnergySensor",
   "asantaga/wiserHomeAssistantPlatform",
   "asev/homeassistant-helios",
@@ -86,6 +85,7 @@
   "aturri/ha-zcsazzurro",
   "atxbyea/samsungrac",
   "atymic/project_three_zero_ha",
+  "audiconnect/audi_connect_ha",
   "augustas2/eldes",
   "austinmroczek/neovolta",
   "avolmensky/panasonic_eolia",
@@ -381,6 +381,7 @@
   "gtjadsonsantos/vapix",
   "guerrerotook/securitas-direct-new-api",
   "GuilleGF/hassio-ovh",
+  "GuyKh/ims-custom-component",
   "GuyLewin/home-assistant-crunch-o-meter",
   "GuyLewin/home-assistant-lifetime-fitness",
   "GuySie/ha-meural",
@@ -410,7 +411,6 @@
   "HomeAssistant-Mods/home-assistant-miele",
   "hostcc/hass-gs-alarm",
   "HrGaertner/HA-vent-optimization",
-  "htmltiger/config-editor",
   "hudsonbrendon/ha_epic_games",
   "hudsonbrendon/sensor.drivvo",
   "hugobloem/stateful_scenes",
@@ -462,7 +462,6 @@
   "jihao/rokid-webhook-hass",
   "jippi/hass-nordnet",
   "jjlawren/sonos_cloud",
-  "jm-73/Indego",
   "jmcollin78/solar_optimizer",
   "jmcollin78/versatile_thermostat",
   "jmcruvellier/little_monkey",
@@ -474,7 +473,6 @@
   "joleys/niko-home-control-II",
   "jonasbkarlsson/ev_smart_charging",
   "JonasJoKuJonas/homeassistant-WebUntis",
-  "jonasniesner/open_epaper_link_homeassistant",
   "JonasPed/homeassistant-eloverblik",
   "jonkristian/wasteplan_trv",
   "joselcaguilar/azure-openai-ha",
@@ -488,6 +486,7 @@
   "jugla/keyatome",
   "jugla/worldtidesinfocustom",
   "juicejuice/homeassistant_redback",
+  "junkfix/config-editor",
   "JurajNyiri/HomeAssistant-Atrea",
   "JurajNyiri/HomeAssistant-qBitTorrentAlternativeSpeed",
   "JurajNyiri/HomeAssistant-Tapo-Control",
@@ -555,6 +554,7 @@
   "lewei50/ha_iammeter_modbus",
   "libdyson-wg/ha-dyson",
   "lichtteil/local_luftdaten",
+  "Limych/ha-apparent-temperature",
   "Limych/ha-average",
   "Limych/ha-beward",
   "Limych/ha-car_wash",
@@ -563,7 +563,6 @@
   "Limych/ha-jq300",
   "Limych/ha-narodmon",
   "Limych/ha-snowtire",
-  "Limych/ha-temperature-feels-like",
   "lindell/home-assistant-svt-play",
   "lindell/home-assistant-tv4-play",
   "linsvensson/sensor.greenely",
@@ -693,6 +692,7 @@
   "olibos/HomeAssistant-RecycleApp",
   "ollo69/ha-samsungtv-smart",
   "ollo69/ha-smartthinq-sensors",
+  "OpenEPaperLink/Home_Assistant_Integration",
   "osk2/panasonic_smart_app",
   "osohotwateriot/osoenergy_community",
   "oven-lab/tuya_cloud_map_extractor",
@@ -811,6 +811,7 @@
   "safepay/sensor.willyweather",
   "samjsmart/ha-zone4",
   "samuolis/brink",
+  "sander1988/Indego",
   "sanghviharshit/ha-mila",
   "sanghviharshit/ha-monarchmoney",
   "sbabcock23/hass-tryfi",
@@ -875,7 +876,6 @@
   "syssi/xiaomi_fan",
   "syssi/xiaomi_raw",
   "syssi/xiaomiplug",
-  "t0mer/ims-custom-component",
   "t0mer/manish-custom-notifier",
   "t0mer/matterbridge-custom-notifier",
   "taarskog/home-assistant-component-somweb",
@@ -968,7 +968,7 @@
   "WillCodeForCats/tekmar-482",
   "willholdoway/hifiberry",
   "wills106/homeassistant-solax-modbus",
-  "wimb0/home-assistant-saj-modbus",
+  "wimb0/home-assistant-saj-r5-modbus",
   "wizmo2/zidoo-player",
   "wlcrs/huawei_solar",
   "wolffshots/hass-audiobookshelf",
diff --git a/plugin b/plugin
index 7601b635a3..ae7cc0da11 100644
--- a/plugin
+++ b/plugin
@@ -132,8 +132,6 @@
   "gurbyz/power-wheel-card",
   "hasl-sensor/lovelace-hasl-departure-card",
   "hasl-sensor/lovelace-hasl-traffic-status-card",
-  "htmltiger/config-editor-card",
-  "htmltiger/numberbox-card",
   "hulkhaugen/hass-bha-icons",
   "Hypfer/lovelace-valetudo-map-card",
   "iablon/HomeAssistant-Touchpad-Card",
@@ -164,6 +162,8 @@
   "jtbgroup/kodi-playlist-card",
   "jtbgroup/kodi-search-card",
   "junalmeida/homeassistant-minimalistic-area-card",
+  "junkfix/config-editor-card",
+  "junkfix/numberbox-card",
   "JurajNyiri/PlexMeetsHomeAssistant",
   "kalkih/mini-graph-card",
   "kalkih/mini-media-player",
diff --git a/theme b/theme
index c93a691f96..571020e76f 100644
--- a/theme
+++ b/theme
@@ -62,11 +62,11 @@
   "Neekster/MidnightTeal",
   "Nerwyn/material-rounded-theme",
   "Nihvel/your_name",
-  "orickcorreia/caule-themes-pack-1",
   "pacjo/google_dark_animated",
   "pbeckcom/green_slate_theme",
   "piitaya/lovelace-mushroom-themes",
   "Poeschl/slate_red",
+  "ricardoquecria/caule-themes-pack-1",
   "robinwittebol/whatsapp-theme",
   "seangreen2/slate_theme",
   "SnakeFist007/ha_vastayan_bond",