Major changes and reworking of theme.