Some fixes to theme chapter. #12697, #10266

Change-Id: Ib6a7fb92150692d60934c435953b99ef91c7336d