Refactoring and externalize caterpillar themes