[Bug 358461] Include more background/themes