Introduce better theme, some more work