Gruntfile tweaks, theme tweaks