cleanup bootstrap and highlight options; cleanup template