final theme edits