Updating dependencies. Matching new vars from theme. Adding more tests.