updated for wintersmith 2.0