Refactor theme resource directory layout
Update version pin