improve insertion of pgf{theme...,}

[KristofferC]

instead of inserting a nested Option with a nothing value we now instead insert the keys directly into the Options being created. This means we can now access keys in the splatted "theme" just like if it was written inline

[fredrikekre]

Thanks.