merged changes from older, unforked theme