Total renaming & refactoring; new theme