Merge in WIP FxOSS theme

We are at a point where it makes sense to iron out the remaining work directly on master.