diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
index cd05082..4c72f64 100644
--- a/.github/workflows/deploy-pages.yml
+++ b/.github/workflows/deploy-pages.yml
@@ -22,6 +22,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      
+      - name: Fetch github stats
+        run: python3 scripts/fetch-stats.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build static API
         run: |
diff --git a/public_html/index.html b/public_html/index.html
index 225dbb7..3f68656 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -22,6 +22,8 @@ <h1 class="text-5xl font-bold text-[#c4b5fd] mb-4">RusherHack Addons</h1>
             </div>
                 <div class="flex gap-4">
                 <select id="sortSelect" class="px-4 py-3 rounded-xl text-sm cursor-pointer min-w-[160px]">
+                    <option value="stars">Most Stars</option>
+                    <option value="downloads">Most Downloads</option>
                     <option value="newest">Newest First</option>
                     <option value="oldest">Oldest First</option>
                     <option value="az">Name A-Z</option>
@@ -96,6 +98,8 @@ <h1 class="text-5xl font-bold text-[#c4b5fd] mb-4">RusherHack Addons</h1>
                 })
 
                 filtered.sort((a, b) => {
+                    if (sortBy === 'stars') return (b.stars || 0) - (a.stars || 0);
+                    if (sortBy === 'downloads') return (b.downloads || 0) - (a.downloads || 0);
                     if (sortBy === 'az') return a.name.localeCompare(b.name)
                     if (sortBy === 'za') return b.name.localeCompare(a.name)
 
diff --git a/scripts/fetch-stats.py b/scripts/fetch-stats.py
new file mode 100644
index 0000000..8238115
--- /dev/null
+++ b/scripts/fetch-stats.py
@@ -0,0 +1,51 @@
+import json
+import os
+import requests
+import time
+
+JSON_PATH = "generated/json/plugins-and-themes.json"
+TOKEN = os.getenv("GITHUB_TOKEN")
+
+def get_github_stats(repo):
+    headers = {"Authorization": f"token {TOKEN}"} if TOKEN else {}
+    stats = {"stars": 0, "downloads": 0}
+    try:
+        #Stars
+        req = requests.get(f"https://api.github.com/repos/{repo}", headers=headers, timeout=10)
+        if (req.status_code) == 200:#its so cool
+            stats["stars"] = req.json().get("stargazers_count", 0)
+        
+        #Downloads
+        req = requests.get(f"https://api.github.com/repos/{repo}/releases", headers=headers, timeout=10)
+        if (req.status_code) == 200:
+            releases = req.json()
+            stats["downloads"] = sum(asset.get("download_count", 0) for release in releases for asset in release.get("assets", []))
+    except Exception as e:
+        print(f"Error fetching stats for {repo}: {e}")
+    
+    return stats
+
+def main():
+    if (not os.path.exists(JSON_PATH)):
+        print(f"JSON file not found at {JSON_PATH}")
+        return
+    
+    with open(JSON_PATH, "r", encoding="utf-8") as f:
+        data = json.load(f)
+    
+    print("Fetching GitHub stats...")
+    for category in ["plugins", "themes"]:
+        for item in data.get(category, []):
+            repo = item.get("repo", "")
+            if (repo and "/" in repo):
+                res = get_github_stats(repo)
+                item["stars"] = res["stars"]
+                item["downloads"] = res["downloads"]
+                time.sleep(0.05)#github delay
+    
+    with open(JSON_PATH, "w", encoding="utf-8") as f:
+        json.dump(data, f, indent=4)
+    print("Stats updated successfully.")
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file