Made good general headway, adding sub-theme stuff