Factoring and integration

I’ve factored more code and integrated many of the basic layout
features into the roots theme.