More work on moving styles out of line and extending RTL support