Prepare for merge with the final theme