Fixes an error in the first version of this commit. Accidentally included theme entries from anther patch which isn't yet merged.
Fixes an error in the first version of this commit. Accidentally included theme entries from anther patch which isn't yet merged.