Move stuff to theme extension.
Update theme.