Update configuration + Merge theme whitespace from upstream