diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b622c38..17a4964 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,17 +9,8 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
 
-      - name: Clone origin
-        run: git clone --depth 1 https://github.com/hacs/default /tmp/repositories/default
-
-      - name: Set category
-        id: category
-        run: echo "::set-output name=category::$(python3 -m scripts.changed.category)"
-
-      - name: Validate ${{ matrix.checks }}
-        if: steps.category.outputs.category != 'Bad data []'
-        run:
-          jq --raw-output "." "${{steps.category.outputs.category}}"
+      - name: Validate
+        run: jq --raw-output . appdaemon blacklist critical integration netdaemon plugin python_script removed theme
 
   sorted:
     name: Sorted
@@ -27,5 +18,6 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
+
       - name: Check lists
         run: python3 scripts/is_sorted.py
\ No newline at end of file
diff --git a/appdaemon b/appdaemon
index e7e4475..88524ac 100644
--- a/appdaemon
+++ b/appdaemon
@@ -61,8 +61,8 @@
   "UbhiTS/ad-autointernetrebooter",
   "UbhiTS/ad-calendartvreminders",
   "vash3d/nethassmo",
-  "wernerhp/appdaemon_aqara_motion_sensors",
-  "wernerhp/appdaemon_wasp",
+  "wernerhp/ha.appdaemon.aqara_motion_sensors",
+  "wernerhp/ha.appdaemon.wasp",
   "XaF/qolsysgw",
   "xaviml/controllerx"
 ]
\ No newline at end of file
diff --git a/integration b/integration
index 4e79cdb..8008782 100644
--- a/integration
+++ b/integration
@@ -3,7 +3,7 @@
   "0xAlon/tami4edge",
   "5high/konke",
   "5high/phicomm-dc1-homeassistant",
-  "9a4gl/hass-peltec",
+  "9a4gl/hass-centrometal-boiler",
   "9rpp/securifi",
   "a529987659852/openwbmqtt",
   "AaronDavidSchneider/SonosAlarm",
@@ -205,7 +205,6 @@
   "danielrivard/homeassistant-innova",
   "danielsmith-eu/home-assistant-themeparks-integration",
   "danobot/entity-controller",
-  "DarkSir23/sensor.mylar",
   "DarwinsBuddy/WienerNetzeSmartmeter",
   "dave-code-ruiz/elkbledom",
   "dave-code-ruiz/uhomeuponor",
@@ -220,6 +219,7 @@
   "DeerMaximum/Technische-Alternative-CMI",
   "definitio/ha-rhvoice",
   "definitio/ha-sox",
+  "dext0r/yandex_smart_home",
   "dgomes/ha_erse",
   "dgomes/ha_generic_water_heater",
   "dgomes/ha_rrd_recorder",
@@ -237,7 +237,6 @@
   "dmamontov/hass-ledfx",
   "dmamontov/hass-miwifi",
   "dmamontov/hass-seafile",
-  "dmitry-k/yandex_smart_home",
   "dmoranf/home-assistant-wattio",
   "dolezsa/thermal_comfort",
   "doudz/homeassistant-myjdownloader",
@@ -328,6 +327,9 @@
   "golles/Home-Assistant-Sensor-MC66C",
   "greghesp/ha-evonic",
   "gregoryduckworth/GoogleGeocode-HASS",
+  "gtjadsonsantos/consul",
+  "gtjadsonsantos/controlid",
+  "gtjadsonsantos/vapix",
   "guerrerotook/securitas-direct-new-api",
   "GuilleGF/hassio-ovh",
   "GuyLewin/home-assistant-crunch-o-meter",
@@ -378,9 +380,6 @@
   "J-Lindvig/Fuelprices_DK",
   "JAAlperin/hass-bardolph",
   "JaccoR/hass-entso-e",
-  "jadson179/consul",
-  "jadson179/controlid",
-  "jadson179/vapix",
   "jaruba/ha-samsungtv-tizen",
   "jason0x43/hacs-hubitat",
   "JayBlackedOut/hass-nhlapi",
@@ -561,7 +560,7 @@
   "N0ciple/hass-kef-connector",
   "nagyrobi/home-assistant-custom-components-cover-rf-time-based",
   "nagyrobi/home-assistant-custom-components-linkplay",
-  "nbogojevic/homeassistant-midea-dehumidifier-lan",
+  "nbogojevic/homeassistant-midea-air-appliances-lan",
   "ndom91/homeassistant-checkly",
   "neggert/hass-egauge",
   "NemesisRE/sensor.plex_recently_added",
@@ -572,9 +571,9 @@
   "nick2525/broadlink_s1c_s2c",
   "NickM-27/swatch-hass-integration",
   "nickneos/HA_harmony_climate_component",
+  "nicole-ashley/homeassistant-goldair-climate",
   "nielsfaber/alarmo",
   "nielsfaber/scheduler-component",
-  "nikrolls/homeassistant-goldair-climate",
   "nstrelow/ha_philips_android_tv",
   "nyffchanium/argoclima-integration",
   "ofalvai/home-assistant-candy",
@@ -817,6 +816,7 @@
   "WillCodeForCats/solaredge-modbus-multi",
   "WillCodeForCats/tekmar-482",
   "willholdoway/hifiberry",
+  "WillowMist/sensor.mylar",
   "wills106/homsassistant-solax-modbus",
   "wimb0/home-assistant-saj-modbus",
   "wizmo2/zidoo-player",
diff --git a/python_script b/python_script
index 87cb541..268c0f3 100644
--- a/python_script
+++ b/python_script
@@ -5,7 +5,7 @@
   "eyalcha/ha-reminder",
   "iml885203/HA-FanSpeedControl",
   "kodi1/tracker_merge",
-  "mf-social/ps-date-countdown",
   "pmazz/ps_hassio_entities",
+  "point-4ward/ps-date-countdown",
   "Santobert/HA-UpdateClimate"
 ]
\ No newline at end of file
diff --git a/theme b/theme
index ee425d7..71f852c 100644
--- a/theme
+++ b/theme
@@ -1,6 +1,6 @@
 [
   "3ative/3ative-blue-theme",
-  "78wesley/Darkish-Theme",
+  "78wesley/Home-Assistant-Darkish-Theme",
   "aFFekopp/dark_teal",
   "aFFekopp/noctis",
   "am80l/sundown",