Make this play nicekly with monokai themes
Update a few regexes