Update Gruntfile and refactor theme