Refactoring + working on the default theme