Worok on supporting themeswitcher with own custom logic
Refactoring content from server (projectData...)