Gruntfile improvements and 2 new themes