Modified theme boilerplate (#14370)

Change-Id: I65f8a157cb84ad3a259e8fb7bd14970221b68a07