Update Thor to 0.18.1