More summary support. Added themes.