diff --git a/.github/workflows/validate_blueprint.yml b/.github/workflows/validate_blueprint.yml
index 6adc4c4..6a3aaa3 100644
--- a/.github/workflows/validate_blueprint.yml
+++ b/.github/workflows/validate_blueprint.yml
@@ -18,4 +18,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.0
       - name: Validate nspanel_blueprint.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_blueprint.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_blueprint.yaml
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index e1d0294..abab06a 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -21,21 +21,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.0
       - name: Validate nspanel_esphome.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
       - name: Validate nspanel_esphome_core.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_upload_tft.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
       - name: Validate nspanel_esphome_advanced.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_advanced.yaml
       - name: Validate nspanel_esphome_addon_climate_base.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_heat.yaml
       - name: Validate nspanel_esphome_addon_climate_dual.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_dual.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_dual.yaml
 
   build_core:
     name: Core
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index 4b1f0ba..462534d 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -25,21 +25,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.0
       - name: Validate nspanel_esphome.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
       - name: Validate nspanel_esphome_core.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_upload_tft.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
       - name: Validate nspanel_esphome_advanced.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_advanced.yaml
       - name: Validate nspanel_esphome_addon_climate_base.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_heat.yaml
       - name: Validate nspanel_esphome_addon_climate_dual.yaml
-        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_dual.yaml
+        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_dual.yaml
 
   build_core:
     name: Core
diff --git a/.github/workflows/validate_markdown.yml b/.github/workflows/validate_markdown.yml
index b73028f..2c1b478 100644
--- a/.github/workflows/validate_markdown.yml
+++ b/.github/workflows/validate_markdown.yml
@@ -12,12 +12,24 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4.1.0
 
-    # https://github.com/actionshub/markdownlint
+    # https://github.com/marketplace/actions/markdownlint-cli2-action
+    - name: Identify changed files
+      uses: tj-actions/changed-files@v41
+      id: changed-files
+      with:
+        files: '**/*.md'
+        separator: ","
     - name: Markdown Lint
-      uses: actionshub/markdownlint@main
+      uses: DavidAnson/markdownlint-cli2-action@v14
+      if: steps.changed-files.outputs.any_changed == 'true'
+      with:
+        globs: ${{ steps.changed-files.outputs.all_changed_files }}
+        separator: ","
+        config: '.rules/custom.markdownlint.jsonc'
 
     # https://github.com/gaurav-nelson/github-action-markdown-link-check  
     - name: Markdown links
       uses: gaurav-nelson/github-action-markdown-link-check@v1
       with:
         check-modified-files-only: 'yes'
+
diff --git a/.rules/custom.markdownlint.jsonc b/.rules/custom.markdownlint.jsonc
new file mode 100644
index 0000000..b6cb536
--- /dev/null
+++ b/.rules/custom.markdownlint.jsonc
@@ -0,0 +1,3 @@
+{
+    "line-length": 200
+}
\ No newline at end of file
diff --git a/.yamllint/rules.yml b/.rules/yamllint.yml
similarity index 100%
rename from .yamllint/rules.yml
rename to .rules/yamllint.yml