ELDAR PATCH: Theme refactoring