Played with Themes

I pulled in all of the updated grammar from @rhyvin and I created separate themes (dark is default).