themes and plugins
Merge remote-tracking branch 'origin/nt' into nt