Fix style for expired/revoked keys

Implemented ideas in #481