some small refactoring
themes implemented