Review: of some code
Fix: theme installation process

fails due to 8a7778f5f038dc6a606cb0e787a535e3cf825096