Monokai theme fixes.
Major refactoring!