Final fixups to theme