Updates. Some fixes and mostly syntax def updates

When I used this again I got really annoyed by the scope usages (which I probably set myself when I was using a different color scheme), so I changed that. Then I noticed that regex replace patterns are not properly matched and did a lot more.

I also made some bug fixes to the code. I recommend skipping through each commit individually, or just accept it. ;)