diff --git a/.hgignore b/.hgignore
index 10c99f0..c575f6a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,31 +1,50 @@
 syntax: glob
 
+# Build config
 local.conf
-*.swp
-ws
-tags
-.DS_Store
-pEp.egg-info
-dist
-build
-.pythonhist
-.gnupg
-.lldb
-.pEp_management.db*
-.python_history
-__pycache__
-test/Laptop
-test/Library
-test/Phone
-test/TestInbox
-test/Backup
-test/lib
-test/imap_settings.py
-venv
-launch.json
-settings.json
-# Default ignored files
+
+# Python artifacts
+/build/
+/dist/
+__pycache__/
+*.py[co]
+/.tox
+.pytest_cache
+/venv/
+/_venv/
+*.egg-info/
+/*.egg-link
+/*.egg
+/.eggs/
+/pip-wheel-metadata/
+
+# file generated by setuptools_scm
+/src/pEp/__version__.py
+
+# Doc artifacts
+/docs/build/
+
+# Test artifacts
+/test/Laptop
+/test/Library
+/test/Phone
+/test/TestInbox
+/test/Backup
+/test/lib
+/test/imap_settings.py
+
+# Editor artifacts and config
 .idea/
-docs/build/
-.eggs
-.tox
+*~
+.\#*
+\#*#
+*.swp
+.idea
+.spyproject
+*.code-workspace
+
+# platform artifacts
+.DS_store
+
+
+