Captcha rewriting

WIP
What do you think about these changes?