Minor cleanup.
Fix/add missing status strings to theme.