Formatting SELECT statements

How can I have my SELECT DISTINCT statements to be formatted like the one below?

	Code:
	SELECT DISTINCT s.name ,s.[schema_id] ,s.principal_id FROM sys.schemas AS s

With

	Code:
	SELECT ... AS ... ,... = ... FROM ... AS ... ,... JOIN ... ON ... = ... AND ... WHERE ... = ... AND ... OR ... GROUP BY ... ,... HAVING ... ,... ORDER BY ... ,...

the result is

	Code:
	SELECT DISTINCT s.name ,s.[schema_id] ,s.principal_id FROM sys.schemas AS s

and this

	Code:
	SELECT DISTINCT ... AS ... ,... = ... FROM ... AS ... ,... JOIN ... ON ... = ... AND ... WHERE ... = ... AND ... OR ... GROUP BY ... ,... HAVING ... ,... ORDER BY ... ,...

does not format SELECT statements at all, regardless there is a DISTINCT or not.

I can reproduce the same result, but not sure how to workaround the DISTINCT keyword issue, still looking into this.