Initial draft of theme rework.