Some improvements and fixes. Quote theming. Etc.