* Even more refactoring done inside theme folder