Rid of extra spacing, and commented theme settings