Improve extraction logic and use fancy colors