VE-908: More light/dark theming