theme and minor edits