Refactored with new theme
Merged into Master