Upgraded packages
Tweaked highlighting and installed packages