Mass changes

Didn't have internet connection so i couldn't commit.

- Standardised the code
- Rewrote the highlighting code
- Rewrote the Surrounding code