added installation phase and initiated refactoring of theme