Reorgainsation of Theme Config

TOC, titles and rejig of order for sub components