diff --git a/.gitignore b/.gitignore
index e442abf..4937229 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,47 @@
-# Example .gitignore file for your config dir.
-# An * ensures that everything will be ignored.
+# --- Global ignores ---
 .DS_Store
-include/.DS_Store
+custom_components/
 old*
 
-# You can whitelist files/folders with !, these will not be ignored.
-!*.yaml
-!.gitignore
-!*.md
-!.travis.yml
-!fake_privkey.pem
-!fake_fullchain.pem
-!.HA_VERSION
-!customize
-!www/*
-!include/*
-!custom_components/*
-!include/*.yaml
-!include/automations/*.yaml
-!include/binary_sensors/*.yaml
-!include/groups/*.yaml
-!include/input/*.yaml
-!include/input/select/*.yaml
-!include/input/datetime/*.yaml
-!include/input/number/*.yaml
-!include/lights/*.yaml
-!include/panels/*.yaml
-!include/resources/*.yaml
-!include/scripts/*.yaml
-!include/sensors/*.yaml
-!include/shell_commands/*.yaml
-!include/switches/*.yaml
-!themes/*
-!python_scripts/*
-!view/*.yaml
-!view/cards/*.yaml
+# System / runtime folders
+.storage/
+.cloud/
+.google.token/
+.Rproj.user/
 
-# Ignore folders.
-.storage
-.cloud
-.google.token
+# Logs / DB / temp
+*.log*
+*.db*
+.com*
 
-# Ensure these YAML files are ignored, otherwise your secret data/credentials will leak.
+# Sensitive files
 ip_bans.yaml
 secrets.yaml
 known_devices.yaml
 configuration_full.yaml
 configuration_minimal.yaml
-.Rproj.user
 
-# log files
-*.log*
-*.db*
-.com*
+# Specific ignore
 include/automations/lys_have.yaml
+
+# --- Whitelist core files ---
+!*.yaml
+!*.md
+!.gitignore
+!.travis.yml
+!*.pem
+!.HA_VERSION
+!customize
+
+# --- Whitelist directories ---
+!www/
+!include/
+!themes/
+!python_scripts/
+!view/
+
+# --- Allow structured YAML inside include/ ---
+!include/**/*.yaml
+
+# --- Allow view YAML ---
+!view/**/*.yaml