Full themes version 2 support. Closes #4