diff --git a/README.md b/README.md
index 1c75bd9..35f720a 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ The easiest way to quickly integrate the 2Captcha captcha-solving service into y
     - [reCAPTCHA v3](#recaptcha-v3)
     - [FunCaptcha](#funcaptcha)
     - [GeeTest](#geetest)
-    - [hCaptcha](#hcaptcha)
     - [GeeTest v4](#geetest-v4)
+    - [hCaptcha](#hcaptcha)
     - [Lemin Cropped Captcha](#lemin-cropped-captcha)
     - [Cloudflare Turnstile](#cloudflare-turnstile)
     - [Amazon WAF](#amazon-waf)
diff --git a/setup.py b/setup.py
index 4cb04cc..bed8bd4 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,15 @@ def get_version():
           "Programming Language :: Python :: 3",
           "License :: OSI Approved :: MIT License",
           "Operating System :: OS Independent",
+          "Topic :: Software Development :: Libraries :: Python Modules",
+          "Topic :: Scientific/Engineering :: Image Recognition",
+          "Topic :: Utilities",
+          "Intended Audience :: Developers",
       ],
+      keywords=[
+          '2captcha', 'captcha', 'api', 'captcha solver', 'reCAPTCHA', 'hCaptcha',
+          'FunCaptcha', 'Geetest', 'image captcha', 'Coordinates', 'Click Captcha',
+          'Geetest V4', 'Lemin captcha', 'Amazon WAF', 'Cloudflare Turnstile',
+          'Capy Puzzle', 'MTCaptcha', 'Friendly Captcha', 'Tencent'],
       python_requires='>=3.6',
       test_suite='tests')