Scraper / Huge theme update

Scraper is now more accurate