De-modulizing theme. Will package and publish when stable.