Many small commits moving toward theme-agnostic quickstart

See logs for description