Additional user_client option and new themes

Also remove user_client option separator, looks bad when using other
themes