Add image/gif detection, and plaintext detection