Some template adjustments. Far from finished.