Refactored plugins & theme