identation corrected and themes added