Finishing Integration of Docs & Themes