Update theme

Not finished yet, but we can start tracking progress.