Initial tasks for theme improvement

In Progress