Lilac compatibility

Include changes from upstream that make theme compatible with Lilac